Fixed the tests and use stable version of php-cache

Nyholm · Nyholm · commit 4073af8af9d8 · 2017-08-01T09:50:42.000+02:00
diff --git a/composer.json b/composer.json
@@ -33,9 +33,9 @@
         "php-http/mock-client": "^1.0",
         "nyholm/psr7": "^0.2.2",
         "nyholm/nsa": "^1.1",
-        "cache/simple-cache-bridge": "^0.1.1",
-        "cache/array-adapter": "^0.5.0",
-        "cache/void-adapter": "^0.4.1"
+        "cache/simple-cache-bridge": "^1.0",
+        "cache/array-adapter": "^1.0",
+        "cache/void-adapter": "^1.0"
     },
     "suggest": {
         "ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
@@ -55,6 +55,7 @@
         "test": "vendor/bin/phpunit"
     },
     "minimum-stability": "dev",
+    "prefer-dist": true,
     "extra": {
         "branch-alias": {
             "dev-master": "4.0-dev"
diff --git a/src/Plugin/Tests/Plugin/CachePluginTest.php b/src/Plugin/Tests/Plugin/CachePluginTest.php
@@ -24,7 +24,7 @@ public function testPluginMiss()
     {
         $ttl = 4711;
         $query = GeocodeQuery::create('foo');
-        $queryString = $query->__toString();
+        $queryString = sha1($query->__toString());
         $cache = $this->getMockBuilder(VoidCachePool::class)
             ->disableOriginalConstructor()
             ->setMethods(['get', 'set'])
@@ -53,7 +53,7 @@ public function testPluginMiss()
     public function testPluginHit()
     {
         $query = GeocodeQuery::create('foo');
-        $queryString = $query->__toString();
+        $queryString = sha1($query->__toString());
         $cache = $this->getMockBuilder(VoidCachePool::class)
             ->disableOriginalConstructor()
             ->setMethods(['get', 'set'])
diff --git a/src/Plugin/Tests/PluginProviderTest.php b/src/Plugin/Tests/PluginProviderTest.php
@@ -115,16 +115,12 @@ public function testLoopException()
     {
         $this->expectException(LoopException::class);
         $geocodeQuery = GeocodeQuery::create('foo');
-        $collection = new AddressCollection([]);
 
         $provider = $this->getMockBuilder(Provider::class)
             ->disableOriginalConstructor()
             ->setMethods(['geocodeQuery', 'reverseQuery', 'getName'])
             ->getMock();
-        $provider->expects($this->once())
-            ->method('geocodeQuery')
-            ->with($geocodeQuery)
-            ->willReturn($collection);
+        $provider->expects($this->never())->method('geocodeQuery');
         $provider->expects($this->never())->method('reverseQuery');
         $provider->expects($this->never())->method('getName');
 
@@ -133,13 +129,23 @@ public function testLoopException()
             ->setMethods(['handleQuery'])
             ->getMock();
         $pluginA->expects($this->any())
+            ->method('handleQuery')
+            ->with($geocodeQuery, $this->isType('callable'), $this->isType('callable'))
+            ->willReturnCallback(function (Query $query, callable $next, callable $first) {
+                return $next($query);
+            });
+        $pluginB = $this->getMockBuilder(Plugin::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['handleQuery'])
+            ->getMock();
+        $pluginB->expects($this->any())
             ->method('handleQuery')
             ->with($geocodeQuery, $this->isType('callable'), $this->isType('callable'))
             ->willReturnCallback(function (Query $query, callable $next, callable $first) {
                 return $first($query);
             });
 
-        $pluginProvider = new PluginProvider($provider, [$pluginA]);
+        $pluginProvider = new PluginProvider($provider, [$pluginA, $pluginB]);
         $pluginProvider->geocodeQuery($geocodeQuery);
     }
 }
diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^6.1",
-        "cache/void-adapter": "^0.4.1"
+        "cache/void-adapter": "^1.0"
     },
     "autoload": {
         "psr-4": { "Geocoder\\Plugin\\": "" },
