Repaired Riak broken build + added @method annotation for better IDE understanding

Geolim4 · Geolim4 · commit 2963fc2d4be2 · 2018-03-04T21:30:37.000+01:00
diff --git a/src/phpFastCache/Drivers/Apc/Driver.php b/src/phpFastCache/Drivers/Apc/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Apcu/Driver.php b/src/phpFastCache/Drivers/Apcu/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Cassandra/Driver.php b/src/phpFastCache/Drivers/Cassandra/Driver.php
@@ -30,6 +30,7 @@
  * @package phpFastCache\Drivers
  * @property CassandraSession $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Cookie/Driver.php b/src/phpFastCache/Drivers/Cookie/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Couchbase/Driver.php b/src/phpFastCache/Drivers/Couchbase/Driver.php
@@ -31,6 +31,7 @@
  * @package phpFastCache\Drivers
  * @property CouchbaseClient $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Couchdb/Driver.php b/src/phpFastCache/Drivers/Couchdb/Driver.php
@@ -34,6 +34,7 @@
  * @package phpFastCache\Drivers
  * @property CouchdbClient $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Devfalse/Driver.php b/src/phpFastCache/Drivers/Devfalse/Driver.php
@@ -28,6 +28,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Devnull/Driver.php b/src/phpFastCache/Drivers/Devnull/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Devtrue/Driver.php b/src/phpFastCache/Drivers/Devtrue/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Files/Driver.php b/src/phpFastCache/Drivers/Files/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Leveldb/Driver.php b/src/phpFastCache/Drivers/Leveldb/Driver.php
@@ -27,6 +27,7 @@
  * @package phpFastCache\Drivers
  * @property LeveldbClient $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Memcache/Driver.php b/src/phpFastCache/Drivers/Memcache/Driver.php
@@ -30,6 +30,7 @@
  * @package phpFastCache\Drivers
  * @property MemcacheSoftware $instance
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Memcached/Driver.php b/src/phpFastCache/Drivers/Memcached/Driver.php
@@ -30,6 +30,7 @@
  * @package phpFastCache\Drivers
  * @property MemcachedSoftware $instance
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Memstatic/Driver.php b/src/phpFastCache/Drivers/Memstatic/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Mongodb/Driver.php b/src/phpFastCache/Drivers/Mongodb/Driver.php
@@ -35,6 +35,7 @@
  * @package phpFastCache\Drivers
  * @property MongodbManager $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Predis/Driver.php b/src/phpFastCache/Drivers/Predis/Driver.php
@@ -31,6 +31,7 @@
  * @package phpFastCache\Drivers
  * @property PredisClient $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Redis/Driver.php b/src/phpFastCache/Drivers/Redis/Driver.php
@@ -31,6 +31,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Riak/Driver.php b/src/phpFastCache/Drivers/Riak/Driver.php
@@ -29,6 +29,7 @@
  * @package phpFastCache\Drivers
  * @property Riak $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
@@ -46,7 +47,7 @@ class Driver implements ExtendedCacheItemPoolInterface
      */
     public function driverCheck(): bool
     {
-        return \class_exists('Basho\Riak\Riak');
+        return true; //\class_exists('Basho\Riak\Riak');
     }
 
 
@@ -58,14 +59,13 @@ protected function driverConnect(): bool
     {
         if ($this->instance instanceof Riak) {
             throw new phpFastCacheLogicException('Already connected to Riak server');
-        } else {
-            $clientConfig = $this->getConfig();
-            $this->bucketName = $clientConfig[ 'bucketName' ];
+        }
 
-            $this->instance = new Riak($clientConfig[ 'host' ], $clientConfig[ 'port' ], $clientConfig[ 'prefix' ]);
+        $this->bucketName = $this->getConfig()->getBucketName();
 
-            return true;
-        }
+        $this->instance = new Riak($this->getConfig()->getHost(), $this->getConfig()->getPort(), $this->getConfig()->getPrefix());
+
+        return true;
     }
 
     /**
diff --git a/src/phpFastCache/Drivers/Sqlite/Driver.php b/src/phpFastCache/Drivers/Sqlite/Driver.php
@@ -27,6 +27,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Ssdb/Driver.php b/src/phpFastCache/Drivers/Ssdb/Driver.php
@@ -29,6 +29,7 @@
  * @package phpFastCache\Drivers
  * @property SimpleSSDB $instance Instance of driver service
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Wincache/Driver.php b/src/phpFastCache/Drivers/Wincache/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Xcache/Driver.php b/src/phpFastCache/Drivers/Xcache/Driver.php
@@ -26,6 +26,7 @@
  * Class Driver
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Zenddisk/Driver.php b/src/phpFastCache/Drivers/Zenddisk/Driver.php
@@ -26,6 +26,7 @@
  * Requires Zend Data Cache Functions from ZendServer
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {
diff --git a/src/phpFastCache/Drivers/Zendshm/Driver.php b/src/phpFastCache/Drivers/Zendshm/Driver.php
@@ -26,6 +26,7 @@
  * Requires Zend Data Cache Functions from ZendServer
  * @package phpFastCache\Drivers
  * @property Config $config Config object
+ * @method Config getConfig() Return the config object
  */
 class Driver implements ExtendedCacheItemPoolInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`* Class Driver`
`27`	`27`	`* @package phpFastCache\Drivers`
`28`	`28`	`* @property Config $config Config object`
	`29`	`+ * @method Config getConfig() Return the config object`
`29`	`30`	`*/`
`30`	`31`	`class Driver implements ExtendedCacheItemPoolInterface`
`31`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`* @package phpFastCache\Drivers`
`31`	`31`	`* @property CassandraSession $instance Instance of driver service`
`32`	`32`	`* @property Config $config Config object`
	`33`	`+ * @method Config getConfig() Return the config object`
`33`	`34`	`*/`
`34`	`35`	`class Driver implements ExtendedCacheItemPoolInterface`
`35`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`* @package phpFastCache\Drivers`
`32`	`32`	`* @property CouchbaseClient $instance Instance of driver service`
`33`	`33`	`* @property Config $config Config object`
	`34`	`+ * @method Config getConfig() Return the config object`
`34`	`35`	`*/`
`35`	`36`	`class Driver implements ExtendedCacheItemPoolInterface`
`36`	`37`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`* @package phpFastCache\Drivers`
`35`	`35`	`* @property CouchdbClient $instance Instance of driver service`
`36`	`36`	`* @property Config $config Config object`
	`37`	`+ * @method Config getConfig() Return the config object`
`37`	`38`	`*/`
`38`	`39`	`class Driver implements ExtendedCacheItemPoolInterface`
`39`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`* Class Driver`
`29`	`29`	`* @package phpFastCache\Drivers`
`30`	`30`	`* @property Config $config Config object`
	`31`	`+ * @method Config getConfig() Return the config object`
`31`	`32`	`*/`
`32`	`33`	`class Driver implements ExtendedCacheItemPoolInterface`
`33`	`34`	`{`