fix for modern-phystrix v4

yupmin · Mar 5, 2020 · 6c7f883 · 6c7f883
1 parent d0a01f4
commit 6c7f883
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -13,9 +13,9 @@
         "php": "^7.1.3",
         "ext-apcu": "*",
         "ext-json": "*",
-        "illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0.0",
-        "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0.0",
-        "yupmin/modern-phystrix": "^3.1"
+        "illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0.0|^7.0.0",
+        "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0.0|^7.0.0",
+        "yupmin/modern-phystrix": "^4.0"
     },
     "require-dev": {
         "dms/phpunit-arraysubset-asserts": "^0.1.0",

diff --git a/phpcs.xml b/phpcs.xml
@@ -48,6 +48,6 @@
        PEAR standard exists inside the PHP_CodeSniffer install
        directory.
     -->
-    <rule ref="PSR2"/>
+    <rule ref="PSR12"/>
 
 </ruleset>
diff --git a/src/Console/Commands/MakePhystrixCommand.php b/src/Console/Commands/MakePhystrixCommand.php
@@ -33,7 +33,7 @@ class MakePhystrixCommand extends GeneratorCommand
      */
     protected function getStub()
     {
-        return __DIR__.'/../stubs/phystrix-command.stub';
+        return __DIR__ . '/../stubs/phystrix-command.stub';
     }
 
     /**
@@ -44,6 +44,6 @@ protected function getStub()
      */
     protected function getDefaultNamespace($rootNamespace)
     {
-        return $rootNamespace.'\Phystrix';
+        return $rootNamespace . '\Phystrix';
     }
 }
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -18,7 +18,7 @@ class ServiceProvider extends BaseServiceProvider
      */
     public function boot()
     {
-        $source = realpath(__DIR__.'/../config/phystrix.php');
+        $source = realpath(__DIR__ . '/../config/phystrix.php');
         if ($this->app instanceof LaravelApplication) {
             $this->publishes([$source => config_path('phystrix.php')]);
         }
@@ -43,7 +43,7 @@ public function register()
             /** @var Application $app */
             $config = $app['config']['phystrix'];
             /** @var Phystrix\StateStorageInterface $stateStorage */
-            $stateStorage = $app->make('phystrix.state-storage.'.$config['state_storage_type']);
+            $stateStorage = $app->make('phystrix.state-storage.' . $config['state_storage_type']);
 
             return new Phystrix\CommandFactory(
                 new Config($config),
@@ -58,7 +58,7 @@ public function register()
             $config = $app['config']['phystrix'];
 
             /** @var Phystrix\MetricsEventStream\MetricsPollerInterface $metricsPoller */
-            $metricsPoller = $app->make('phystrix.metrics-event-stream.'.$config['state_storage_type'], [
+            $metricsPoller = $app->make('phystrix.metrics-event-stream.' . $config['state_storage_type'], [
                 'config' => new Config($config)
             ]);