[TASK] Remove zend-json dependency

Fixes: heiseonline#56
erkenes · Aug 2, 2016 · 6898d23 · 6898d23
1 parent c6155ec
commit 6898d23
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 170 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Requirements
 To run Shariff PHP Backend on your server you need one of these PHP versions:
 
 * 5.6
-* 7.0
+* 7.0-7.1
 
 Older versions and HHVM are not supported.
 
@@ -37,7 +37,9 @@ Installing the Shariff backend on you own server
 
 To run Shariff under a certain URL, unzip the [release](https://github.com/heiseonline/shariff-backend-php/releases) zip file into a directory under the document root of your web server.
 
-This zip file contains a configuration file `shariff.json`. The following configuration options are available:
+Take a look into the demo application in the `index.php` file and adjust the configuration as necessary. 
+
+The following configuration options are available:
 
 | Key         | Type | Description |
 |-------------|------|-------------|

diff --git a/build.sh b/build.sh
@@ -4,7 +4,6 @@ mkdir -p build
 rm -fr build/*
 composer install --prefer-dist --no-dev
 cp index.php build
-cp shariff.json build
 cp -a vendor build
 cp -a src build
 composer install
diff --git a/composer.json b/composer.json
@@ -20,9 +20,7 @@
     	"php": ">=5.5.0",
         "guzzlehttp/guzzle": "^6.1",
         "psr/log": "1.0.0",
-        "zendframework/zend-cache": "*",
-        "zendframework/zend-json": "*",
-        "zendframework/zend-config": "*"
+        "zendframework/zend-cache": "^2.7"
     },
     "require-dev": {
         "phpunit/phpunit": "~5.3",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -3,23 +3,49 @@
 require_once __DIR__.'/vendor/autoload.php';
 
 use Heise\Shariff\Backend;
-use Zend\Config\Reader\Json;
 
+/**
+ * Demo Application using Shariff Backend
+ */
 class Application
 {
+    /**
+     * Sample configuration
+     *
+     * @var array
+     */
+    private static $configuration = [
+        'cache' => [
+            'ttl' => 60
+        ],
+        'domains' => [
+            'www.heise.de',
+            'www.ct.de'
+        ],
+        'services' => [
+            'GooglePlus',
+            'Facebook',
+            'LinkedIn',
+            'Reddit',
+            'StumbleUpon',
+            'Flattr',
+            'Pinterest',
+            'Xing',
+            'AddThis'
+        ]
+    ];
+
     public static function run()
     {
         header('Content-type: application/json');
 
-        if (!isset($_GET["url"])) {
+        $url = isset($_GET['url']) ? $_GET['url'] : '';
+        if ($url) {
+            $shariff = new Backend(self::$configuration);
+            echo json_encode($shariff->get($url));
+        } else {
             echo json_encode(null);
-            return;
         }
-
-        $reader = new Json();
-
-        $shariff = new Backend($reader->fromFile('shariff.json'));
-        echo json_encode($shariff->get($_GET["url"]));
     }
 }
 

diff --git a/shariff.json b/shariff.json
diff --git a/src/Backend/BackendManager.php b/src/Backend/BackendManager.php
@@ -93,19 +93,19 @@ public function setLogger(LoggerInterface $logger = null)
     public function get($url)
     {
 
-        // Aenderungen an der Konfiguration invalidieren den Cache
-        $cache_key = md5($url.$this->baseCacheKey);
+        // Changing configuration invalidates the cache
+        $cacheKey = md5($url.$this->baseCacheKey);
 
         if (!filter_var($url, FILTER_VALIDATE_URL)) {
-            return;
+            return null;
         }
 
-        if ($this->cache->hasItem($cache_key)) {
-            return json_decode($this->cache->getItem($cache_key), true);
+        if ($this->cache->hasItem($cacheKey)) {
+            return json_decode($this->cache->getItem($cacheKey), true);
         }
 
         if (!$this->isValidDomain($url)) {
-            return;
+            return null;
         }
 
         $requests = array_map(
@@ -116,7 +116,7 @@ function ($service) use ($url) {
             $this->services
         );
 
-        /** @var ResponseInterface[] $results */
+        /** @var ResponseInterface[]|TransferException[] $results */
         $results = Pool::batch($this->client, $requests);
 
         $counts = [];
@@ -139,7 +139,7 @@ function ($service) use ($url) {
             }
         }
 
-        $this->cache->setItem($cache_key, json_encode($counts));
+        $this->cache->setItem($cacheKey, json_encode($counts));
 
         return $counts;
     }

diff --git a/src/Backend/Facebook.php b/src/Backend/Facebook.php
@@ -61,6 +61,6 @@ protected function getAccessToken()
             return $response->getBody();
         }
 
-        return;
+        return null;
     }
 }
diff --git a/src/ZendCache.php b/src/ZendCache.php
@@ -49,15 +49,7 @@ public function __construct(array $configuration)
         }
 
         if ($cache instanceof ClearExpiredInterface) {
-            if (function_exists('register_postsend_function')) {
-                // for hhvm installations: executing after response / session close
-                register_postsend_function(function () use ($cache) {
-                    $cache->clearExpired();
-                });
-            } else {
-                // default
-                $cache->clearExpired();
-            }
+            $cache->clearExpired();
         }
 
         $this->cache = $cache;
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,6 +61,6 @@ protected function getAccessToken() @@
                 return $response->getBody();
             }
-            return;
+            return null;
         }
     }