Bugs fixed

Author: oscarotero

Embed/Adapters/Adapter.php

@@ -11,6 +11,8 @@
 
 abstract class Adapter
 {
+    protected $request;
+
     public $providers = array();
     public $options = array(
         'minImageWidth' => 0,

Embed/Adapters/Soundcloud.php

@@ -26,7 +26,7 @@ protected function initProviders(Request $request)
 
         $api = new Request('http://api.soundcloud.com/resolve.json');
         $api->setParameter('client_id', isset($this->options['soundcloudClientId']) ? $this->options['soundcloudClientId'] : 'YOUR_CLIENT_ID');
-        $api->setParameter('url', $Url->getUrl());
+        $api->setParameter('url', $request->getUrl());
 
         if ($json = $api->getJsonContent()) {
             $this->api->set($json);

Embed/Request.php

@@ -45,7 +45,7 @@ public function setUrl($url)
         if ($url instanceof RequestResolvers\RequestResolverInterface) {
             $this->resolver = $url;
         } else {
-            $this->resolver = new static::$defaultResolver($url);
+            $this->resolver = new self::$defaultResolver($url);
         }
 
         $this->parseUrl($this->resolver->getLatestUrl());

Embed/Sources/Feed.php

@@ -74,7 +74,7 @@ protected static function getRssItems(\SimpleXMLElement $items)
     {
         $rssItems = array();
 
-        $namespaces = $Items->getNamespaces(true);
+        $namespaces = $items->getNamespaces(true);
 
         foreach ($items as $item) {
             $rssItem = array(
@@ -100,7 +100,7 @@ protected static function getRssItems(\SimpleXMLElement $items)
             }
         }
 
-        return $rssItem;
+        return $rssItems;
     }
 
     protected static function parseAtom(\SimpleXMLElement $xml)

test-sources.php

@@ -53,25 +53,23 @@
         if (!empty($_GET['url'])): ?>
         <section>
             <?php
-
-            $Url = new Embed\Url($_GET['url']);
-
-            $Source = Embed\Embed::createSource($Url);
+            $request = new Embed\Request($_GET['url']);
+            $source = Embed\Embed::createSource($request);
             ?>
 
-            <?php if (empty($Source)): ?>
+            <?php if (empty($source)): ?>
 
             <p>The url is not valid!</p>
 
             <?php else: ?>
 
-            <h1><a href="<?php echo $Source->providerUrl; ?>"><?php echo $Source->providerUrl; ?></a></h1>
+            <h1><a href="<?php echo $source->providerUrl; ?>"><?php echo $source->providerUrl; ?></a></h1>
 
-            <a href="test.php?url=<?php echo $Source->providerUrl; ?>" target="_blank">Test</a><br>
-            <a href="<?php echo $Source->sourceUrl; ?>" target="_blank">Source url</a>
+            <a href="test.php?url=<?php echo $source->providerUrl; ?>" target="_blank">Test</a><br>
+            <a href="<?php echo $source->sourceUrl; ?>" target="_blank">Source url</a>
 
             <ul>
-                <?php foreach ($Source->items as $url): ?>
+                <?php foreach ($source->items as $url): ?>
                 <li>
                     <a href="<?php echo $url['url']; ?>"><?php echo $url['url']; ?></a> | <a href="test.php?url=<?php echo urlencode($url['url']); ?>" target="_blank">Test</a><br>
                     <?php if ($url['originUrl']): ?>
@@ -89,22 +87,10 @@
             <tr>
                 <th>Content</th>
                 <td>
-                    <pre><?php echo htmlspecialchars($Url->getContent(), ENT_IGNORE); ?></pre>
+                    <pre><?php echo htmlspecialchars($url->getContent(), ENT_IGNORE); ?></pre>
                 </td>
             </tr>
         </table>
-
-        <?php elseif (!empty($_FILES['opml']['tmp_name'])): ?>
-        <section>
-            <?php
-            $string = file_get_contents($_FILES['opml']['tmp_name']);
-            $feeds = Embed\Sources\Feed::createFromOPML($string);
-
-            echo '<pre>';
-            var_dump($feeds);
-            echo '</pre>';
-            ?>
-        </section>
         <?php endif; ?>
 
     </body>

test.php

@@ -101,7 +101,7 @@ function getOption($name, $default = null)
                     <td>
                         <ul>
                         <?php
-                        foreach ($url->getResult() as $name => $value) {
+                        foreach ($url->getRequestInfo() as $name => $value) {
                             if (is_array($value)) {
                                 $value = print_r($value, true);
                             }