Merge pull request #12222 from cakephp/entity-docs

Fix EntityTrait examples and route parsing with brace style routes.
cakephp · Jun 14, 2018 · 34e90fa · 34e90fa
2 parents 79c2a62 + 9d2b24e
commit 34e90fa
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -934,7 +934,7 @@ public function getError($field)
      *
      * ```
      * // Sets the error messages for multiple fields at once
-     * $entity->errors(['salary' => ['message'], 'name' => ['another message']);
+     * $entity->setErrors(['salary' => ['message'], 'name' => ['another message']);
      * ```
      *
      * @param array $fields The array of errors to set.
@@ -960,7 +960,7 @@ public function setErrors(array $fields, $overwrite = false)
      *
      * ```
      * // Sets the error messages for a single field
-     * $entity->errors('salary', ['must be numeric', 'must be a positive number']);
+     * $entity->setError('salary', ['must be numeric', 'must be a positive number']);
      * ```
      *
      * @param string $field The field to get errors for, or the array of errors to set.

diff --git a/src/Routing/Route/Route.php b/src/Routing/Route/Route.php
@@ -866,6 +866,10 @@ public function staticPath()
         if ($routeKey !== false) {
             return substr($this->template, 0, $routeKey);
         }
+        $routeKey = strpos($this->template, '{');
+        if ($routeKey !== false && strpos($this->template, '}') !== false) {
+            return substr($this->template, 0, $routeKey);
+        }
         $star = strpos($this->template, '*');
         if ($star !== false) {
             $path = rtrim(substr($this->template, 0, $star), '/');

diff --git a/tests/TestCase/Routing/Route/RouteTest.php b/tests/TestCase/Routing/Route/RouteTest.php
@@ -1728,6 +1728,26 @@ public function testStaticPath()
         $route = new Route('/:controller/:action/*');
         $this->assertEquals('/', $route->staticPath());
 
+        $route = new Route('/api/{/:action/*');
+        $this->assertEquals('/api/{/', $route->staticPath());
+
+        $route = new Route('/books/reviews', ['controller' => 'Reviews', 'action' => 'index']);
+        $this->assertEquals('/books/reviews', $route->staticPath());
+    }
+
+    /**
+     * Test getting the static path for a route.
+     *
+     * @return void
+     */
+    public function testStaticPathBrace()
+    {
+        $route = new Route('/pages/{id}/*', ['controller' => 'Pages', 'action' => 'display']);
+        $this->assertEquals('/pages/', $route->staticPath());
+
+        $route = new Route('/{controller}/{action}/*');
+        $this->assertEquals('/', $route->staticPath());
+
         $route = new Route('/books/reviews', ['controller' => 'Reviews', 'action' => 'index']);
         $this->assertEquals('/books/reviews', $route->staticPath());
     }