Merge pull request #3113 from antograssiot/security-bc-break

Fix BC-break when using short-syntax notation for access_control

Author: soyuka

src/Annotation/AttributesHydratorTrait.php

@@ -49,6 +49,17 @@ private function hydrateAttributes(array $values): void
             unset($values['attributes']);
         }
 
+        if (\array_key_exists('accessControl', $values)) {
+            $values['security'] = $values['accessControl'];
+            @trigger_error('Attribute "accessControl" is deprecated in annotation since API Platform 2.5, prefer using "security" attribute instead', E_USER_DEPRECATED);
+            unset($values['accessControl']);
+        }
+        if (\array_key_exists('accessControlMessage', $values)) {
+            $values['securityMessage'] = $values['accessControlMessage'];
+            @trigger_error('Attribute "accessControlMessage" is deprecated in annotation since API Platform 2.5, prefer using "securityMessage" attribute instead', E_USER_DEPRECATED);
+            unset($values['accessControlMessage']);
+        }
+
         foreach ($values as $key => $value) {
             $key = (string) $key;
             if (!property_exists($this, $key)) {

tests/Annotation/ApiResourceTest.php

@@ -143,4 +143,17 @@ public function testConstructWithInvalidAttribute()
             'invalidAttribute' => 'exception',
         ]);
     }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation Attribute "accessControl" is deprecated in annotation since API Platform 2.5, prefer using "security" attribute instead
+     * @expectedDeprecation Attribute "accessControlMessage" is deprecated in annotation since API Platform 2.5, prefer using "securityMessage" attribute instead
+     */
+    public function testWithDeprecatedAttributes()
+    {
+        new ApiResource([
+            'accessControl' => "is_granted('ROLE_USER')",
+            'accessControlMessage' => 'Nope!',
+        ]);
+    }
 }