moved run() out of AdapterInterface, minor fixes

Author: oscarotero

demo/index.php

@@ -207,7 +207,7 @@ function printCode($code, $asHtml = true)
                 <h2>Http request info</h2>
 
                 <table>
-                    <?php foreach ($info->request->getRequestInfo() as $name => $value): ?>
+                    <?php foreach ($info->getRequest()->getRequestInfo() as $name => $value): ?>
                     <tr>
                         <th><?php echo $name; ?></th>
                         <td><?php printAny($value); ?></td>
@@ -218,7 +218,7 @@ function printCode($code, $asHtml = true)
                 <h2>Content</h2>
 
                 <pre>
-                    <?php printText($info->request->getContent()); ?>
+                    <?php printText($info->getRequest()->getContent()); ?>
                 </pre>
             </div>
         </section>

src/Adapters/Adapter.php

@@ -97,9 +97,12 @@ protected function init()
     }
 
     /**
-     * Get the request.
-     *
-     * @return Request
+     * Run the adapter.
+     */
+    abstract protected function run();
+
+    /**
+     * {@inheritdoc}
      */
     public function getRequest()
     {
@@ -123,21 +126,15 @@ protected function addProvider($name, ProviderInterface $provider)
     }
 
     /**
-     * Get a provider.
-     *
-     * @param string $name
-     *
-     * @return null|ProviderInterface
+     * {@inheritdoc}
      */
     public function getProvider($name)
     {
         return isset($this->providers[$name]) ? $this->providers[$name] : null;
     }
 
     /**
-     * Get all providers.
-     *
-     * @return array
+     * {@inheritdoc}
      */
     public function getAllProviders()
     {

src/Adapters/AdapterInterface.php

@@ -28,9 +28,27 @@ public static function check(Request $request);
     public function __construct(Request $request, array $config = null);
 
     /**
-     * Run the provider.
+     * Returns the request instance.
+     *
+     * @return Request
+     */
+    public function getRequest();
+
+    /**
+     * Returns a provider.
+     *
+     * @param string $name
+     *
+     * @return null|ProviderInterface
+     */
+    public function getProvider($name);
+
+    /**
+     * Get all providers.
+     *
+     * @return array
      */
-    public function run();
+    public function getAllProviders();
 
     /**
      * Gets all icon provider urls found

src/Adapters/Archive.php

@@ -24,7 +24,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         $this->addProvider('archive', new Api\Archive());
 

src/Adapters/Facebook.php

@@ -23,7 +23,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         $this->addProvider('facebook', new Api\Facebook());
 

src/Adapters/File.php

@@ -47,7 +47,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         $this->addProvider('oembed', new Providers\OEmbed());
     }

src/Adapters/Github.php

@@ -24,7 +24,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         if ($this->request->getHost() === 'gist.github.com') {
             $this->addProvider('gist', new Api\Gist());

src/Adapters/Google.php

@@ -26,7 +26,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         if ($this->request->match('*/maps/*')) {
             $this->addProvider('google', new Api\GoogleMaps());

src/Adapters/Imageshack.php

@@ -23,7 +23,7 @@ public static function check(Request $request)
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         $this->addProvider('imageshack', new Api\Imageshack());
 

src/Adapters/N500px.php

@@ -54,7 +54,7 @@ public function getHeight()
     /**
      * {@inheritdoc}
      */
-    public function run()
+    protected function run()
     {
         //order is important
         $this->addProvider('oembed', new Providers\OEmbed());