Merge branch '3.next' into 3.x

Author: markstory

src/Command/PolicyCommand.php

@@ -88,12 +88,16 @@ public function templateData(Arguments $arguments): array
             $suffix = 'Table';
         }
 
+        $imports = [];
         $className = $data['namespace'] . '\\' . $name;
         if ($type === 'table') {
             $className = "{$data['namespace']}\Model\\Table\\{$name}{$suffix}";
+            $imports[] = 'Cake\ORM\SelectQuery';
         } elseif ($type === 'entity') {
             $className = "{$data['namespace']}\Model\\Entity\\{$name}";
+            $imports[] = $className;
         }
+        $imports[] = 'Authorization\\IdentityInterface';
 
         $variable = Inflector::variable($name);
         if ($variable === 'user') {
@@ -106,6 +110,7 @@ public function templateData(Arguments $arguments): array
             'suffix' => $suffix,
             'variable_name' => $variable,
             'classname' => $className,
+            'imports' => $imports,
         ];
 
         return $vars + $data;

templates/bake/element/table_methods.twig

@@ -0,0 +1,10 @@
+    /**
+     * Apply user access controls to a query for index actions
+     *
+     * @param \Authorization\IdentityInterface $user The user.
+     * @param \Cake\ORM\SelectQuery $query The query to apply authorization conditions to.
+     * @return bool
+     */
+    public function scopeIndex(IdentityInterface $user, SelectQuery $query): SelectQuery
+    {
+    }

templates/bake/policy.twig

@@ -18,10 +18,6 @@ declare(strict_types=1);
 
 namespace {{ namespace }}\Policy;
 
-{% set imports = [
-    'Authorization\\IdentityInterface',
-    classname,
-] %}
 {% for import in imports|sort %}
 use {{ import }};
 {% endfor %}
@@ -33,5 +29,7 @@ class {{ name }}{{ suffix }}Policy
 {
 {% if type == 'entity' %}
     {{- _view.element('Authorization.entity_methods') -}}
+{% elseif type == 'table' %}
+    {{- _view.element('Authorization.table_methods') -}}
 {% endif %}
 }

tests/comparisons/BookmarksTablePolicy.php

@@ -4,11 +4,21 @@
 namespace TestApp\Policy;
 
 use Authorization\IdentityInterface;
-use TestApp\Model\Table\BookmarksTable;
+use Cake\ORM\SelectQuery;
 
 /**
  * Bookmarks policy
  */
 class BookmarksTablePolicy
 {
+    /**
+     * Apply user access controls to a query for index actions
+     *
+     * @param \Authorization\IdentityInterface $user The user.
+     * @param \Cake\ORM\SelectQuery $query The query to apply authorization conditions to.
+     * @return bool
+     */
+    public function scopeIndex(IdentityInterface $user, SelectQuery $query): SelectQuery
+    {
+    }
 }

tests/comparisons/TestPluginUsersTablePolicy.php

@@ -4,11 +4,21 @@
 namespace TestPlugin\Policy;
 
 use Authorization\IdentityInterface;
-use TestPlugin\Model\Table\UsersTable;
+use Cake\ORM\SelectQuery;
 
 /**
  * Users policy
  */
 class UsersTablePolicy
 {
+    /**
+     * Apply user access controls to a query for index actions
+     *
+     * @param \Authorization\IdentityInterface $user The user.
+     * @param \Cake\ORM\SelectQuery $query The query to apply authorization conditions to.
+     * @return bool
+     */
+    public function scopeIndex(IdentityInterface $user, SelectQuery $query): SelectQuery
+    {
+    }
 }

tests/comparisons/ThingPolicy.php

@@ -4,7 +4,6 @@
 namespace TestApp\Policy;
 
 use Authorization\IdentityInterface;
-use TestApp\Thing;
 
 /**
  * Thing policy