integrate astrotomic/php-conditional-proxy

Author: Gummibeer

composer.json

@@ -15,7 +15,8 @@
         }
     ],
     "require": {
-        "php": "^7.4"
+        "php": "^7.4",
+        "astrotomic/php-conditional-proxy": "^0.1.0"
     },
     "require-dev": {
         "pestphp/pest": "^0.1.5",

src/BaseObject.php

@@ -2,38 +2,21 @@
 
 namespace Astrotomic\OpenGraph;
 
-use Closure;
+use Astrotomic\ConditionalProxy\HasConditionalCalls;
 
 abstract class BaseObject
 {
+    use HasConditionalCalls;
+
     /** @var BaseObject[] */
     protected array $tags = [];
 
-    /**
-     * @param $condition
-     * @param Closure|null $callback
-     *
-     * @return $this|ConditionalProxy
-     */
-    public function when($condition, ?Closure $callback = null)
-    {
-        if ($callback === null) {
-            return new ConditionalProxy($this, boolval($condition));
-        }
-
-        if ($condition) {
-            $callback($this);
-        }
-
-        return $this;
-    }
-
-    protected function setProperty(string $prefix, string $property, string $content)
+    public function setProperty(string $prefix, string $property, string $content)
     {
         $this->tags[$prefix.':'.$property] = Property::make($prefix, $property, $content);
     }
 
-    protected function addProperty(string $prefix, string $property, string $content)
+    public function addProperty(string $prefix, string $property, string $content)
     {
         $this->tags[] = Property::make($prefix, $property, $content);
     }

src/TwitterType.php

@@ -9,7 +9,7 @@ abstract class TwitterType extends BaseObject
     public function __construct(?string $title = null)
     {
         $this->setProperty(self::PREFIX, 'card', $this->type);
-        $this->when(! empty($title), fn () => $this->title($title));
+        $this->when($title)->title($title);
     }
 
     public static function make(?string $title = null)
@@ -41,7 +41,7 @@ public function description(string $description)
     public function image(string $image, ?string $alt = null)
     {
         $this->setProperty(self::PREFIX, 'image', $image);
-        $this->when(! empty($alt), fn () => $this->setProperty(self::PREFIX, 'image:alt', $alt));
+        $this->when($alt)->setProperty(self::PREFIX, 'image:alt', $alt);
 
         return $this;
     }

src/Type.php

@@ -13,7 +13,7 @@ abstract class Type extends BaseObject
     public function __construct(?string $title = null)
     {
         $this->setProperty('og', 'type', $this->type);
-        $this->when(! empty($title), fn () => $this->title($title));
+        $this->when($title)->title($title);
     }
 
     public static function make(?string $title = null)
@@ -116,7 +116,7 @@ public function audio($audio)
         return $this;
     }
 
-    protected function addStructuredProperty(BaseObject $property)
+    public function addStructuredProperty(BaseObject $property)
     {
         $this->tags[] = $property;
     }

src/Types/Music/Album.php

@@ -21,8 +21,8 @@ public function musician(string $url)
     public function song(string $url, ?int $disc = null, ?int $track = null)
     {
         $this->addProperty(self::PREFIX, 'song', $url);
-        $this->when($disc > 0, fn () => $this->addProperty(self::PREFIX, 'song:disc', $disc));
-        $this->when($track > 0, fn () => $this->addProperty(self::PREFIX, 'song:track', $track));
+        $this->when($disc > 0)->addProperty(self::PREFIX, 'song:disc', $disc);
+        $this->when($track > 0)->addProperty(self::PREFIX, 'song:track', $track);
 
         return $this;
     }

src/Types/Music/Playlist.php

@@ -20,8 +20,8 @@ public function creator(string $url)
     public function song(string $url, ?int $disc = null, ?int $track = null)
     {
         $this->addProperty(self::PREFIX, 'song', $url);
-        $this->when($disc > 0, fn () => $this->addProperty(self::PREFIX, 'song:disc', $disc));
-        $this->when($track > 0, fn () => $this->addProperty(self::PREFIX, 'song:track', $track));
+        $this->when($disc > 0)->addProperty(self::PREFIX, 'song:disc', $disc);
+        $this->when($track > 0)->addProperty(self::PREFIX, 'song:track', $track);
 
         return $this;
     }

src/Types/Music/Song.php

@@ -27,8 +27,8 @@ public function musician(string $url)
     public function album(string $url, ?int $disc = null, ?int $track = null)
     {
         $this->addProperty(self::PREFIX, 'album', $url);
-        $this->when($disc > 0, fn () => $this->addProperty(self::PREFIX, 'album:disc', $disc));
-        $this->when($track > 0, fn () => $this->addProperty(self::PREFIX, 'album:track', $track));
+        $this->when($disc > 0)->addProperty(self::PREFIX, 'album:disc', $disc);
+        $this->when($track > 0)->addProperty(self::PREFIX, 'album:track', $track);
 
         return $this;
     }

src/Types/Video/Episode.php

@@ -21,7 +21,7 @@ public function series(string $url)
     public function actor(string $url, ?string $role = null)
     {
         $this->addProperty(self::PREFIX, 'actor', $url);
-        $this->when(! empty($role), fn () => $this->addProperty(self::PREFIX, 'actor:role', $role));
+        $this->when($role)->addProperty(self::PREFIX, 'actor:role', $role);
 
         return $this;
     }

src/Types/Video/Movie.php

@@ -14,7 +14,7 @@ class Movie extends Type
     public function actor(string $url, ?string $role = null)
     {
         $this->addProperty(self::PREFIX, 'actor', $url);
-        $this->when(! empty($role), fn () => $this->addProperty(self::PREFIX, 'actor:role', $role));
+        $this->when($role)->addProperty(self::PREFIX, 'actor:role', $role);
 
         return $this;
     }

src/Types/Video/Other.php

@@ -14,7 +14,7 @@ class Other extends Type
     public function actor(string $url, ?string $role = null)
     {
         $this->addProperty(self::PREFIX, 'actor', $url);
-        $this->when(! empty($role), fn () => $this->addProperty(self::PREFIX, 'actor:role', $role));
+        $this->when($role)->addProperty(self::PREFIX, 'actor:role', $role);
 
         return $this;
     }