Amended routing doc (phalcon-orphanage#837)

challet · Jul 21, 2016 · 2a8b629 · 2a8b629
1 parent c72d5b9
commit 2a8b629
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 18 deletions.
diff --git a/en/reference/routing.rst b/en/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/es/reference/routing.rst b/es/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/fr/reference/routing.rst b/fr/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/ja/reference/routing.rst b/ja/reference/routing.rst
@@ -786,10 +786,32 @@ Not Found パス
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 ホスト名によるアクセス制限
 --------------------------

diff --git a/pl/reference/routing.rst b/pl/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/pt/reference/routing.rst b/pt/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/ru/reference/routing.rst b/ru/reference/routing.rst
@@ -824,10 +824,32 @@ This is typically for an Error 404 page.
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Начиная с Phalcon 2.1.0 beta 1, существует ещё один способ сделать эту проверку:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Проверяет был ли запрос сделан с помощью Ajax
+        return $request->isAjax();
+    });
 
 Ограничение по имени хоста
 --------------------------

diff --git a/uk/reference/routing.rst b/uk/reference/routing.rst
@@ -830,10 +830,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 Hostname Constraints
 --------------------

diff --git a/zh/reference/routing.rst b/zh/reference/routing.rst
@@ -831,10 +831,32 @@ And use this class instead of the anonymous function:
 
     <?php
 
-    $router->add('/get/info/{id}', array(
+    $router->add('/get/info/{id}', [
         'controller' => 'products',
         'action'     => 'info'
-    ))->beforeMatch(array(new AjaxFilter(), 'check'));
+    ])->beforeMatch([new AjaxFilter(), 'check']);
+
+Since Phalcon 2.1.0 beta 1, there is another way to check this:
+
+.. code-block:: php
+
+    <?php
+
+    $router->add('/login', [
+        'module'     => 'admin',
+        'controller' => 'session'
+    ])->beforeMatch(function ($uri, $route) {
+        /**
+         * @var string $uri
+         * @var \Phalcon\Mvc\Router\Route $route
+         * @var \Phalcon\DiInterface $this
+         * @var \Phalcon\Http\Request $request
+         */
+        $request = $this->getShared('request');
+
+        // Check if the request was made with Ajax
+        return $request->isAjax();
+    });
 
 限制主机名（Hostname Constraints）
 ----------------------------------