for laminas/config and php 7.1 above

Author: yupmin

.travis.yml

@@ -1,12 +1,10 @@
 language: php
 
 php:
-  - "5.6"
-  - "7.0"
   - "7.1"
   - "7.2"
   - "7.3"
-  - hhvm
+  - "7.4"
 
 before_script:
   - composer install --prefer-dist --dev

README.md

@@ -8,7 +8,7 @@
 
 ## Requirement
 
-* PHP 5.6 above
+* PHP 7.1 above
 * Modern PHP
 
 ### About Phystrix
@@ -21,14 +21,15 @@ In case of a service failing way too often, to not make the situation worse, Phy
 
 ### Differences from [older version(upwork/phystrix)](https://github.com/upwork/phystrix)
 
-* Use PHP 5.6 and PHP 7 above
+* Use PHP 7.1 above
 * Change from 'Zend DI' to 'PSR DI', DI is optional. (for using Your framework)
 * Add [phystrix dashboard](https://github.com/upwork/phystrix-dashboard) library, and fix more.
 * Add Libraries of APCU
-* PSR-2: Coding Style is default.
+* PSR-12: Coding Style is default.
 * PSR-3: Logger Interface(coming soon)
 * PSR-16: Common Interface for Caching Libraries
 
+
 ### Understanding Phystrix
 
 Not only Phystrix was heavily inspired by the amazing [Hystrix library](https://github.com/Netflix/Hystrix) for Java by Netflix, it also attempts to follow the best practices set by the library. You will notice that configuration parameters are the same as well as much of how it works internally.
@@ -41,7 +42,7 @@ Recommended way to install Phystrix is by using [Composer](https://getcomposer.o
 
 ```json
   "require": {
-     "yupmin/modern-phystrix": "~3.0"
+     "yupmin/modern-phystrix": "~4.0"
   },
 
 ```
@@ -96,7 +97,7 @@ Notice, the extra parameters you pass to the factory’s getCommand method are f
 The factory is instantiated as follows:
 
 ```php
-use Zend\Config\Config;
+use Laminas\Config\Config;
 use Odesk\Phystrix\ApcStateStorage;
 use Odesk\Phystrix\CircuitBreakerFactory;
 use Odesk\Phystrix\CommandMetricsFactory;
@@ -120,7 +121,7 @@ $phystrix = new CommandFactory(
 );
 ```
 
-The way you store the configuration files is up to you. Phystrix relies on [Zend\Config](https://github.com/zendframework/Component_ZendConfig)  to manage configurations. In this case, __phystrix-config.php__ is a PHP array:
+The way you store the configuration files is up to you. Phystrix relies on [Laminas\Config](https://github.com/zendframework/Component_ZendConfig)  to manage configurations. In this case, __phystrix-config.php__ is a PHP array:
 
 ```php
 return array(
@@ -188,7 +189,7 @@ Phystrix only works with the command keys. If you have two different commands wi
 Sometimes, you may need to change a parameter when a command is used in a particular context:
 
 ```php
-use Zend\Config\Config;
+use Laminas\Config\Config;
 $myCommand = $phystrix->getCommand('MyCommand', 'Alex');
 $myCommand->setConfig(new Config(array('requestCache' => array('enabled' => false))));
 $result = $myCommand->execute();

composer.json

@@ -12,20 +12,18 @@
         }
     },
     "require": {
-        "php": ">=5.6",
-        "ext-json": "*",
+        "php": ">=7.1",
         "psr/container": "^1.0",
-        "zendframework/zend-config": "^3.2",
-        "psr/simple-cache": "^1.0"
+        "laminas/laminas-config": "^3.3"
     },
     "require-dev": {
-        "php-di/php-di": "~5.4",
         "phpunit/phpunit": "~5.7",
-        "squizlabs/php_codesniffer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.4",
+        "php-di/php-di": "^6.0"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "2.0-dev"
         }
     }
 }

library/Odesk/Phystrix/AbstractCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,29 +17,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 use Odesk\Phystrix\Exception\BadRequestException;
 use Odesk\Phystrix\Exception\FallbackNotAvailableException;
 use Odesk\Phystrix\Exception\RuntimeException;
 use Psr\Container\ContainerInterface;
 use Psr\SimpleCache\CacheInterface;
-use Zend\Config\Config;
+use Laminas\Config\Config;
 use Exception;
 
 /**
  * All Phystrix commands must extend this class
  */
 abstract class AbstractCommand
 {
-    const EVENT_SUCCESS = 'SUCCESS';
-    const EVENT_FAILURE = 'FAILURE';
-    const EVENT_TIMEOUT = 'TIMEOUT';
-    const EVENT_SHORT_CIRCUITED = 'SHORT_CIRCUITED';
-    const EVENT_FALLBACK_SUCCESS = 'FALLBACK_SUCCESS';
-    const EVENT_FALLBACK_FAILURE = 'FALLBACK_FAILURE';
-    const EVENT_EXCEPTION_THROWN = 'EXCEPTION_THROWN';
-    const EVENT_RESPONSE_FROM_CACHE = 'RESPONSE_FROM_CACHE';
+    public const EVENT_SUCCESS = 'SUCCESS';
+    public const EVENT_FAILURE = 'FAILURE';
+    public const EVENT_TIMEOUT = 'TIMEOUT';
+    public const EVENT_SHORT_CIRCUITED = 'SHORT_CIRCUITED';
+    public const EVENT_FALLBACK_SUCCESS = 'FALLBACK_SUCCESS';
+    public const EVENT_FALLBACK_FAILURE = 'FALLBACK_FAILURE';
+    public const EVENT_EXCEPTION_THROWN = 'EXCEPTION_THROWN';
+    public const EVENT_RESPONSE_FROM_CACHE = 'RESPONSE_FROM_CACHE';
 
     /**
      * Command Key, used for grouping Circuit Breakers

library/Odesk/Phystrix/ApcStateStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,20 +17,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 /**
  * APC cache driven storage for Circuit Breaker metrics statistics
  */
 class ApcStateStorage implements StateStorageInterface
 {
-    const BUCKET_EXPIRE_SECONDS = 120;
+    public const BUCKET_EXPIRE_SECONDS = 120;
 
-    const CACHE_PREFIX = 'phystrix_cb_';
+    public const CACHE_PREFIX = 'phystrix_cb_';
 
-    const OPENED_NAME = 'opened';
+    public const OPENED_NAME = 'opened';
 
-    const SINGLE_TEST_BLOCKED = 'single_test_blocked';
+    public const SINGLE_TEST_BLOCKED = 'single_test_blocked';
 
     /**
      * Constructor
@@ -129,7 +131,7 @@ public function allowSingleTest($commandKey, $sleepingWindowInMilliseconds)
         // using 'add' enforces thread safety.
         $sleepingWindowInSeconds = ceil($sleepingWindowInMilliseconds / 1000);
         // another APC limitation is that within the current request variables will never expire.
-        return (boolean) apc_add($singleTestFlagKey, true, $sleepingWindowInSeconds);
+        return (bool)apc_add($singleTestFlagKey, true, $sleepingWindowInSeconds);
     }
 
     /**
@@ -141,7 +143,7 @@ public function allowSingleTest($commandKey, $sleepingWindowInMilliseconds)
     public function isCircuitOpen($commandKey)
     {
         $openedKey = $this->prefix($commandKey . self::OPENED_NAME);
-        return (boolean) apc_fetch($openedKey);
+        return (bool)apc_fetch($openedKey);
     }
 
     /**

library/Odesk/Phystrix/ArrayStateStorage.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 /**

library/Odesk/Phystrix/CircuitBreaker.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,9 +17,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
-use Zend\Config\Config;
+use Laminas\Config\Config;
 
 /**
  * Circuit-breaker logic that is hooked into AbstractCommand execution and will stop allowing executions

library/Odesk/Phystrix/CircuitBreakerFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,9 +17,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
-use Zend\Config\Config;
+use Laminas\Config\Config;
 
 /**
  * Factory to keep track of and instantiate new circuit breakers when needed

library/Odesk/Phystrix/CircuitBreakerInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 /**

library/Odesk/Phystrix/CommandFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,13 +17,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 use Psr\SimpleCache\CacheInterface;
 use ReflectionClass;
 use ReflectionException;
 use Psr\Container\ContainerInterface;
-use Zend\Config\Config;
+use Laminas\Config\Config;
 
 /**
  * All commands must be created through this factory.

library/Odesk/Phystrix/CommandMetrics.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 /**
@@ -140,8 +142,9 @@ public function getHealthCounts()
         // current time in milliseconds
         $now = microtime(true) * 1000;
         // we should make a new snapshot in case there isn't one yet or when the snapshot interval time has passed
-        if (!$this->lastSnapshot
-            || $now - $this->lastSnapshot->getTime() >= $this->healthSnapshotIntervalInMilliseconds) {
+        if (
+            !$this->lastSnapshot || $now - $this->lastSnapshot->getTime() >= $this->healthSnapshotIntervalInMilliseconds
+        ) {
             $this->lastSnapshot = new HealthCountsSnapshot(
                 $now,
                 $this->getRollingCount(MetricsCounter::SUCCESS),

library/Odesk/Phystrix/CommandMetricsFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,9 +17,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
-use Zend\Config\Config;
+use Laminas\Config\Config;
 
 /**
  * Factory to keep track of and instantiate new command metrics objects when needed

library/Odesk/Phystrix/Exception/ApcNotLoadedException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix\Exception;
 
 /**

library/Odesk/Phystrix/Exception/BadRequestException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix\Exception;
 
 /**

library/Odesk/Phystrix/Exception/FallbackNotAvailableException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix\Exception;
 
 /**

library/Odesk/Phystrix/Exception/RuntimeException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix\Exception;
 
 use Exception;

library/Odesk/Phystrix/HealthCountsSnapshot.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This file is a part of the Phystrix library
  *
@@ -16,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 namespace Odesk\Phystrix;
 
 /**