security: Fix tests and legacy check

soyuka · soyuka · commit 3485028e0161 · 2019-09-27T15:29:11.000+02:00
diff --git a/src/Test/DoctrineOrmFilterTestCase.php b/src/Test/DoctrineOrmFilterTestCase.php
@@ -55,9 +55,6 @@ abstract class DoctrineOrmFilterTestCase extends KernelTestCase
      */
     protected $filterClass;
 
-    /**
-     * @group legacy
-     */
     protected function setUp(): void
     {
         self::bootKernel();
diff --git a/tests/Annotation/ApiResourceTest.php b/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!',
+        ]);
+    }
 }
diff --git a/tests/Bridge/Symfony/Bundle/Command/SwaggerCommandTest.php b/tests/Bridge/Symfony/Bundle/Command/SwaggerCommandTest.php
@@ -41,9 +41,6 @@ protected function setUp(): void
         $this->tester = new ApplicationTester($application);
     }
 
-    /**
-     * @group legacy
-     */
     public function testExecuteWithAliasVersion3()
     {
         $this->tester->run(['command' => 'api:swagger:export', '--spec-version' => 3]);
diff --git a/tests/Fixtures/TestBundle/Document/LegacySecuredDummy.php b/tests/Fixtures/TestBundle/Document/LegacySecuredDummy.php
@@ -23,8 +23,7 @@
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
  *
  * @ApiResource(
- *     accessControl="is_granted('ROLE_USER')",
- *     accessControlMessage="Nope!",
+ *     attributes={"access_control"="is_granted('ROLE_USER')"},
  *     collectionOperations={
  *         "get",
  *         "post"={"access_control"="is_granted('ROLE_ADMIN')"}
diff --git a/tests/Fixtures/TestBundle/Entity/LegacySecuredDummy.php b/tests/Fixtures/TestBundle/Entity/LegacySecuredDummy.php
@@ -23,8 +23,7 @@
  * @author Vincent Chalamon <vincentchalamon@gmail.com>
  *
  * @ApiResource(
- *     accessControl="is_granted('ROLE_USER')",
- *     accessControlMessage="Nope!",
+ *     attributes={"access_control"="is_granted('ROLE_USER')"},
  *     collectionOperations={
  *         "get",
  *         "post"={"access_control"="is_granted('ROLE_ADMIN')"}

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,6 @@ abstract class DoctrineOrmFilterTestCase extends KernelTestCase`
`55`	`55`	`*/`
`56`	`56`	`protected $filterClass;`
`57`	`57`
`58`		`- /**`
`59`		`- * @group legacy`
`60`		`- */`
`61`	`58`	`protected function setUp(): void`
`62`	`59`	`{`
`63`	`60`	`self::bootKernel();`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,6 @@ protected function setUp(): void`
`41`	`41`	`$this->tester = new ApplicationTester($application);`
`42`	`42`	`}`
`43`	`43`
`44`		`- /**`
`45`		`- * @group legacy`
`46`		`- */`
`47`	`44`	`public function testExecuteWithAliasVersion3()`
`48`	`45`	`{`
`49`	`46`	`$this->tester->run(['command' => 'api:swagger:export', '--spec-version' => 3]);`