Merge pull request #289 from webimpress/hotfix/content-negotiation

Fixed keys in content-negotiation Admin module
zfcampus · Jan 17, 2018 · 4db0e82 · 4db0e82
2 parents 689a9aa + cce1e45
commit 4db0e82
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/config/admin.config.php b/config/admin.config.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @copyright Copyright (c) 2013-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2013-2017 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
 namespace ZF\Apigility\Doctrine\Admin;
@@ -78,7 +78,7 @@
             Controller\DoctrineRpcService::class      => 'HalJson',
             Controller\DoctrineMetadataService::class => 'HalJson',
         ],
-        'accept-whitelist' => [
+        'accept_whitelist' => [
             Controller\DoctrineAutodiscovery::class => [
                 'application/json',
                 'application/*+json',
@@ -96,7 +96,7 @@
                 'application/*+json',
             ],
         ],
-        'content-type-whitelist' => [
+        'content_type_whitelist' => [
             Controller\DoctrineAutodiscovery::class => [
                 'application/json',
                 'application/*+json',

diff --git a/src/Admin/Model/DoctrineRestServiceModel.php b/src/Admin/Model/DoctrineRestServiceModel.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @copyright Copyright (c) 2013-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2013-2017 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
 namespace ZF\Apigility\Doctrine\Admin\Model;
@@ -730,11 +730,11 @@ public function createContentNegotiationConfig(DoctrineRestServiceEntity $detail
         ];
         $whitelist = $details->acceptWhitelist;
         if (! empty($whitelist)) {
-            $config['accept-whitelist'] = [$controllerService => $whitelist];
+            $config['accept_whitelist'] = [$controllerService => $whitelist];
         }
         $whitelist = $details->contentTypeWhitelist;
         if (! empty($whitelist)) {
-            $config['content-type-whitelist'] = [$controllerService => $whitelist];
+            $config['content_type_whitelist'] = [$controllerService => $whitelist];
         }
         $config = ['zf-content-negotiation' => $config];
         $this->configResource->patch($config, true);
@@ -949,13 +949,13 @@ public function updateContentNegotiationConfig(
 
         $acceptWhitelist = $update->acceptWhitelist;
         if (is_array($acceptWhitelist) && $acceptWhitelist) {
-            $key = $baseKey . 'accept-whitelist.' . $service;
+            $key = $baseKey . 'accept_whitelist.' . $service;
             $this->configResource->patchKey($key, $acceptWhitelist);
         }
 
         $contentTypeWhitelist = $update->contentTypeWhitelist;
         if (is_array($contentTypeWhitelist) && $contentTypeWhitelist) {
-            $key = $baseKey . 'content-type-whitelist.' . $service;
+            $key = $baseKey . 'content_type_whitelist.' . $service;
             $this->configResource->patchKey($key, $contentTypeWhitelist);
         }
     }
@@ -1041,10 +1041,10 @@ public function deleteDoctrineRestConfig(DoctrineRestServiceEntity $entity)
         $key = ['zf-content-negotiation', 'controllers', $entity->controllerServiceName];
         $this->configResource->deleteKey($key);
 
-        $key = ['zf-content-negotiation', 'accept-whitelist', $entity->controllerServiceName];
+        $key = ['zf-content-negotiation', 'accept_whitelist', $entity->controllerServiceName];
         $this->configResource->deleteKey($key);
 
-        $key = ['zf-content-negotiation', 'content-type-whitelist', $entity->controllerServiceName];
+        $key = ['zf-content-negotiation', 'content_type_whitelist', $entity->controllerServiceName];
         $this->configResource->deleteKey($key);
 
         $key = ['zf-hal', 'metadata_map', $entity->collectionClass];
@@ -1210,15 +1210,15 @@ protected function mergeContentNegotiationConfig(
             ]);
         }
 
-        if (isset($config['accept-whitelist'][$controllerServiceName])) {
+        if (isset($config['accept_whitelist'][$controllerServiceName])) {
             $metadata->exchangeArray([
-                'accept_whitelist' => $config['accept-whitelist'][$controllerServiceName],
+                'accept_whitelist' => $config['accept_whitelist'][$controllerServiceName],
             ]);
         }
 
-        if (isset($config['content-type-whitelist'][$controllerServiceName])) {
+        if (isset($config['content_type_whitelist'][$controllerServiceName])) {
             $metadata->exchangeArray([
-                'content-type-whitelist' => $config['content-type-whitelist'][$controllerServiceName],
+                'content_type_whitelist' => $config['content_type_whitelist'][$controllerServiceName],
             ]);
         }
     }

diff --git a/src/Admin/Model/DoctrineRpcServiceModel.php b/src/Admin/Model/DoctrineRpcServiceModel.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @license   http://opensource.org/licenses/BSD-3-Clause BSD-3-Clause
- * @copyright Copyright (c) 2013-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2013-2017 Zend Technologies USA Inc. (http://www.zend.com)
  */
 
 namespace ZF\Apigility\Doctrine\Admin\Model;
@@ -398,13 +398,13 @@ public function createContentNegotiationConfig($controllerService, $selector = n
                 'controllers' => [
                     $controllerService => $selector,
                 ],
-                'accept-whitelist' => [
+                'accept_whitelist' => [
                     $controllerService => [
                         'application/json',
                         'application/*+json',
                     ],
                 ],
-                'content-type-whitelist' => [
+                'content_type_whitelist' => [
                     $controllerService => [
                         'application/json',
                     ],
@@ -556,10 +556,10 @@ public function deleteContentNegotiationConfig($serviceName)
         $key = ['zf-content-negotiation', 'controllers', $serviceName];
         $this->configResource->deleteKey($key);
 
-        $key = ['zf-content-negotiation', 'accept-whitelist', $serviceName];
+        $key = ['zf-content-negotiation', 'accept_whitelist', $serviceName];
         $this->configResource->deleteKey($key);
 
-        $key = ['zf-content-negotiation', 'content-type-whitelist', $serviceName];
+        $key = ['zf-content-negotiation', 'content_type_whitelist', $serviceName];
         $this->configResource->deleteKey($key);
     }