code improvements

Author: oscarotero

src/Adapters/Adapter.php

@@ -6,11 +6,11 @@
 use Embed\Utils;
 use Embed\Request;
 use Embed\Providers\ProviderInterface;
+use Embed\GetTrait;
 
 /**
  * Base class extended by all adapters.
  *
- * @property Request      $request
  * @property null|string  $title
  * @property null|string  $description
  * @property null|string  $url
@@ -34,6 +34,11 @@
  */
 abstract class Adapter
 {
+    use GetTrait;
+
+    /**
+     * @var Request
+     */
     protected $request;
 
     protected $providers = [];
@@ -141,23 +146,6 @@ public function getAllProviders()
         return $this->providers;
     }
 
-    /**
-     * Magic method to execute and save the url data.
-     * For example, on call $this->title, executes $this->getTitle().
-     *
-     * @param string $name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $method = 'get'.$name;
-
-        if (method_exists($this, $method)) {
-            return $this->$name = $this->$method();
-        }
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -199,7 +187,7 @@ public function getType()
 
         return 'link';
     }
-    
+
     /**
      * {@inheritdoc}
      */
@@ -248,7 +236,7 @@ public function getCode()
             foreach ($choosen['providers'] as $provider) {
                 $this->width = $this->providers[$provider]->getWidth();
                 $this->height = $this->providers[$provider]->getHeight();
-                
+
                 if (is_numeric($this->width)) {
                     $this->width = (int) $this->width;
                 }

src/Adapters/Howcast.php

@@ -26,7 +26,7 @@ public function getCode()
     {
         $this->width = null;
         $this->height = null;
-        
+
         $dom = $this->request->getHtmlContent();
         $modal = $dom->getElementById('embedModal');
 

src/Adapters/Jsfiddle.php

@@ -14,7 +14,7 @@ class Jsfiddle extends Webpage implements AdapterInterface
      */
     public function getCode()
     {
-    	$this->width = null;
+        $this->width = null;
         $this->height = null;
 
         $url = $this->url;

src/Adapters/N500px.php

@@ -60,6 +60,5 @@ protected function run()
         $this->addProvider('oembed', new Providers\OEmbed());
         $this->addProvider('opengraph', new Providers\OpenGraph());
         $this->addProvider('html', new Providers\Html());
-
     }
 }

src/DataInterface.php

@@ -31,7 +31,7 @@ public function getDescription();
     public function getType();
 
     /**
-     * Gets the tags of the url
+     * Gets the tags of the url.
      *
      * @return array
      */

src/GetTrait.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Embed;
+
+/**
+ * Trait to provide a magic method to get parameters using get* methods.
+ */
+trait GetTrait
+{
+    /**
+     * Magic method to execute methods on get paramaters
+     * For example, $source->sourceUrl executes $source->getSourceUrl().
+     *
+     * @param string $name The property name
+     *
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        $method = 'get'.$name;
+
+        if (method_exists($this, $method)) {
+            return $this->$name = $this->$method();
+        }
+    }
+}

src/Providers/Html.php

@@ -87,7 +87,6 @@ public function getTags()
         return array_filter(array_map('trim', $keywords));
     }
 
-
     /**
      * {@inheritdoc}
      */

src/Providers/OEmbed.php

@@ -108,12 +108,10 @@ public function getTags()
     {
         if ($this->bag->has('meta[keywords]')) {
             //it means we are using iframe.ly api
-            return array_map('trim', explode(',',$this->bag->get('meta[keywords]')));
+            return array_map('trim', explode(',', $this->bag->get('meta[keywords]')));
         }
-        
-        return [];
 
-        
+        return [];
     }
 
     /**

src/Providers/OpenGraph.php

@@ -33,7 +33,7 @@ public function run()
 
             if ($name === 'image') {
                 $this->bag->add('images', $value);
-            } else if (strpos($name, ':tag') !== false) {
+            } elseif (strpos($name, ':tag') !== false) {
                 $this->bag->add('tags', $value);
             } else {
                 $this->bag->set($name, $value);

src/Sources/Source.php

@@ -2,6 +2,8 @@
 
 namespace Embed\Sources;
 
+use Embed\GetTrait;
+
 /**
  * Base Source extended by all sources
  * Provide default functionalities.
@@ -12,22 +14,7 @@
  */
 abstract class Source
 {
-    public $request;
+    use GetTrait;
 
-    /**
-     * Magic method to execute methods on get paramaters
-     * For example, $source->sourceUrl executes $source->getSourceUrl().
-     *
-     * @param string $name The property name
-     *
-     * @return mixed
-     */
-    public function __get($name)
-    {
-        $method = 'get'.$name;
-
-        if (method_exists($this, $method)) {
-            return $this->$name = $this->$method();
-        }
-    }
+    public $request;
 }