Remainder of patchKey calls have been changed to replaceKey.

zfcampus · Mar 19, 2018 · cb20ab0 · cb20ab0
1 parent 20e849d
commit cb20ab0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/Model/AuthenticationModel.php b/src/Model/AuthenticationModel.php
@@ -440,7 +440,7 @@ public function saveAuthenticationMap($auth, $module, $version = null)
                 422
             );
         }
-        $this->globalConfig->patchKey($key, $auth);
+        $this->globalConfig->replaceKey($key, $auth);
         $this->localConfig->deleteKey($key);
         return true;
     }
@@ -613,7 +613,7 @@ protected function patchHttpAuthConfig(AuthenticationEntity $entity, array $glob
     protected function patchOAuth2Config(AuthenticationEntity $entity, array $global, array $local)
     {
         if (isset($global['route_match']) && $global['route_match']) {
-            $this->globalConfig->patchKey('router.routes.oauth.options.route', $global['route_match']);
+            $this->globalConfig->replaceKey('router.routes.oauth.options.route', $global['route_match']);
         }
 
         switch ($entity->getDsnType()) {
@@ -633,7 +633,7 @@ protected function patchOAuth2Config(AuthenticationEntity $entity, array $global
         }
 
         $key = 'zf-oauth2';
-        $this->localConfig->patchKey($key, $toSet);
+        $this->localConfig->replaceKey($key, $toSet);
     }
 
     /**
@@ -756,7 +756,7 @@ protected function saveAuthenticationAdapter(array $adapter)
                 break;
         }
 
-        $this->localConfig->patchKey($key, $config);
+        $this->localConfig->replaceKey($key, $config);
         $this->globalConfig->deleteKey($key);
         return true;
     }
@@ -803,8 +803,8 @@ protected function updateOAuth2Route($url)
             'spec'  => '%oauth%',
             'regex' => '(?P<oauth>(' . implode('|', $routes) . '))',
         ];
-        $this->globalConfig->patchKey('router.routes.oauth.options', $options);
-        $this->globalConfig->patchKey('router.routes.oauth.type', 'regex');
+        $this->globalConfig->replaceKey('router.routes.oauth.options', $options);
+        $this->globalConfig->replaceKey('router.routes.oauth.type', 'regex');
     }
 
     /**
@@ -839,8 +839,8 @@ protected function removeOAuth2Route($url)
                 'spec'  => '%oauth%',
                 'regex' => '(?P<oauth>(' . implode('|', $routes) . '))',
             ];
-            $this->globalConfig->patchKey('router.routes.oauth.options', $options);
-            $this->globalConfig->patchKey('router.routes.oauth.type', 'regex');
+            $this->globalConfig->replaceKey('router.routes.oauth.options', $options);
+            $this->globalConfig->replaceKey('router.routes.oauth.type', 'regex');
             return true;
         }
 

diff --git a/src/Model/DoctrineAdapterModel.php b/src/Model/DoctrineAdapterModel.php
@@ -40,8 +40,8 @@ public function __construct(ConfigResource $globalConfig, ConfigResource $localC
     public function create($name, array $adapterConfig)
     {
         $key = "doctrine.connection.{$name}";
-        $this->globalConfig->patchKey($key, []);
-        $this->localConfig->patchKey($key, $adapterConfig);
+        $this->globalConfig->replaceKey($key, []);
+        $this->localConfig->replaceKey($key, $adapterConfig);
 
         return new DoctrineAdapterEntity($name, $adapterConfig);
     }

diff --git a/src/Model/InputFilterModel.php b/src/Model/InputFilterModel.php
@@ -132,7 +132,7 @@ protected function addInputFilter($module, $controller, $inputFilter, $validator
 
         if (! isset($config['zf-content-validation'][$controller])) {
             $validatorName = $validatorName ?: $this->generateValidatorName($controller);
-            $config = $configModule->patchKey(
+            $config = $configModule->replaceKey(
                 ['zf-content-validation', $controller, 'input_filter'],
                 $validatorName
             );
@@ -150,7 +150,7 @@ protected function addInputFilter($module, $controller, $inputFilter, $validator
 
         $config['input_filter_specs'][$validator] = $inputFilter;
 
-        $updated = $configModule->patchKey(['input_filter_specs', $validator], $inputFilter);
+        $updated = $configModule->replaceKey(['input_filter_specs', $validator], $inputFilter);
         if (! is_array($updated)) {
             return false;
         }