Merge pull request #3316 from tangix/bugfix-filter

michalsn · web-flow · commit 670372477453 · 2020-07-16T00:00:42.000+02:00
Pass filter arguments to after() and before() methods
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
@@ -57,6 +57,7 @@
  */
 class CSRF implements FilterInterface
 {
+
 	/**
 	 * Do whatever processing this filter needs to do.
 	 * By default it should not return anything during
@@ -68,11 +69,12 @@ class CSRF implements FilterInterface
 	 * redirects, etc.
 	 *
 	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
+	 * @param array|null                                         $arguments
 	 *
 	 * @return mixed
 	 * @throws \CodeIgniter\Security\Exceptions\SecurityException
 	 */
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		if ($request->isCLI())
 		{
@@ -103,10 +105,11 @@ public function before(RequestInterface $request)
 	 *
 	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
 	 * @param ResponseInterface|\CodeIgniter\HTTP\Response       $response
+	 * @param array|null                                         $arguments
 	 *
 	 * @return mixed
 	 */
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
@@ -48,14 +48,16 @@
  */
 class DebugToolbar implements FilterInterface
 {
+
 	/**
 	 * We don't need to do anything here.
 	 *
 	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
+	 * @param array|null                                         $arguments
 	 *
 	 * @return void
 	 */
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 	}
 
@@ -67,10 +69,11 @@ public function before(RequestInterface $request)
 	 *
 	 * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
 	 * @param ResponseInterface|\CodeIgniter\HTTP\Response       $response
+	 * @param array|null                                         $arguments
 	 *
 	 * @return void
 	 */
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 		Services::toolbar()->prepare($request, $response);
 	}
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
@@ -59,10 +59,11 @@ interface FilterInterface
 	 * redirects, etc.
 	 *
 	 * @param \CodeIgniter\HTTP\RequestInterface $request
+	 * @param null                               $arguments
 	 *
 	 * @return mixed
 	 */
-	public function before(RequestInterface $request);
+	public function before(RequestInterface $request, $arguments = null);
 
 	//--------------------------------------------------------------------
 
@@ -74,10 +75,11 @@ public function before(RequestInterface $request);
 	 *
 	 * @param \CodeIgniter\HTTP\RequestInterface  $request
 	 * @param \CodeIgniter\HTTP\ResponseInterface $response
+	 * @param null                                $arguments
 	 *
 	 * @return mixed
 	 */
-	public function after(RequestInterface $request, ResponseInterface $response);
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);
 
 	//--------------------------------------------------------------------
 }
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
@@ -196,7 +196,7 @@ public function run(string $uri, string $position = 'before')
 				}
 				elseif ($position === 'after')
 				{
-					$result = $class->after($this->request, $this->response);
+					$result = $class->after($this->request, $this->response, $this->arguments[$alias] ?? null);
 
 					if ($result instanceof ResponseInterface)
 					{
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
@@ -55,11 +55,11 @@ class Honeypot implements FilterInterface
 	 * then the requester is a bot
 	 *
 	 * @param \CodeIgniter\HTTP\RequestInterface $request
+	 * @param array|null                         $arguments
 	 *
 	 * @return void
-	 * @throws \CodeIgniter\Honeypot\Exceptions\HoneypotException
 	 */
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$honeypot = Services::honeypot(new \Config\Honeypot());
 		if ($honeypot->hasContent($request))
@@ -73,10 +73,11 @@ public function before(RequestInterface $request)
 	 *
 	 * @param \CodeIgniter\HTTP\RequestInterface  $request
 	 * @param \CodeIgniter\HTTP\ResponseInterface $response
+	 * @param array|null                          $arguments
 	 *
 	 * @return void
 	 */
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 		$honeypot = Services::honeypot(new \Config\Honeypot());
 		$honeypot->attachHoneypot($response);
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
@@ -12,6 +12,7 @@
 require_once __DIR__ . '/fixtures/InvalidClass.php';
 require_once __DIR__ . '/fixtures/Multiple1.php';
 require_once __DIR__ . '/fixtures/Multiple2.php';
+require_once __DIR__ . '/fixtures/Role.php';
 
 /**
  * @backupGlobals enabled
@@ -25,6 +26,7 @@ class FiltersTest extends \CodeIgniter\Test\CIUnitTestCase
 	protected function setUp(): void
 	{
 		parent::setUp();
+		Services::reset();
 
 		$this->request  = Services::request();
 		$this->response = Services::response();
@@ -623,17 +625,54 @@ public function testEnableFilterWithArguments()
 			],
 		];
 
-		$filters = new Filters((object) $config, $this->request, $this->response);
+		$filters = new Filters((object)$config, $this->request, $this->response);
 
 		$filters = $filters->initialize('admin/foo/bar');
 
 		$filters->enableFilter('role:admin , super', 'before');
+		$filters->enableFilter('role:admin , super', 'after');
 
 		$found = $filters->getFilters();
 
 		$this->assertTrue(in_array('role', $found['before']));
 		$this->assertEquals(['admin', 'super'], $filters->getArguments('role'));
 		$this->assertEquals(['role' => ['admin', 'super']], $filters->getArguments());
+
+		$response = $filters->run('admin/foo/bar', 'before');
+		$this->assertEquals('admin;super', $response);
+
+		$response = $filters->run('admin/foo/bar', 'after');
+		$this->assertEquals('admin;super', $response->getBody());
+	}
+
+	public function testEnableFilterWithNoArguments()
+	{
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+
+		$config = [
+			'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
+			'globals' => [
+				'before' => [],
+				'after'  => [],
+			],
+		];
+
+		$filters = new Filters((object)$config, $this->request, $this->response);
+
+		$filters = $filters->initialize('admin/foo/bar');
+
+		$filters->enableFilter('role', 'before');
+		$filters->enableFilter('role', 'after');
+
+		$found = $filters->getFilters();
+
+		$this->assertTrue(in_array('role', $found['before']));
+
+		$response = $filters->run('admin/foo/bar', 'before');
+		$this->assertEquals('Is null', $response);
+
+		$response = $filters->run('admin/foo/bar', 'after');
+		$this->assertEquals('Is null', $response->getBody());
 	}
 
 	public function testEnableNonFilter()
diff --git a/tests/system/Filters/fixtures/GoogleCurious.php b/tests/system/Filters/fixtures/GoogleCurious.php
@@ -7,12 +7,12 @@
 class GoogleCurious implements FilterInterface
 {
 
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 				return 'This is curious';
 	}
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/tests/system/Filters/fixtures/GoogleEmpty.php b/tests/system/Filters/fixtures/GoogleEmpty.php
@@ -7,13 +7,13 @@
 class GoogleEmpty implements FilterInterface
 {
 
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$request = '';
 		return $request;
 	}
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/tests/system/Filters/fixtures/GoogleMe.php b/tests/system/Filters/fixtures/GoogleMe.php
@@ -6,7 +6,7 @@
 
 class GoogleMe implements FilterInterface
 {
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$request->url = 'http://google.com';
 
@@ -15,7 +15,7 @@ public function before(RequestInterface $request)
 
 	//--------------------------------------------------------------------
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 		$response->csp = 'http://google.com';
 
diff --git a/tests/system/Filters/fixtures/GoogleYou.php b/tests/system/Filters/fixtures/GoogleYou.php
@@ -8,14 +8,14 @@
 class GoogleYou implements FilterInterface
 {
 
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$response      = Services::response();
 		$response->csp = 'http://google.com';
 		return $response;
 	}
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/tests/system/Filters/fixtures/Multiple1.php b/tests/system/Filters/fixtures/Multiple1.php
@@ -7,13 +7,13 @@
 class Multiple1 implements FilterInterface
 {
 
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$request->csp = 'http://exampleMultipleCSP.com';
 		return $request;
 	}
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/tests/system/Filters/fixtures/Multiple2.php b/tests/system/Filters/fixtures/Multiple2.php
@@ -7,13 +7,13 @@
 class Multiple2 implements FilterInterface
 {
 
-	public function before(RequestInterface $request)
+	public function before(RequestInterface $request, $arguments = null)
 	{
 		$request->url = 'http://exampleMultipleURL.com';
 		return $request;
 	}
 
-	public function after(RequestInterface $request, ResponseInterface $response)
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
 	{
 	}
 
diff --git a/tests/system/Filters/fixtures/Role.php b/tests/system/Filters/fixtures/Role.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace CodeIgniter\Filters\fixtures;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+class Role implements FilterInterface
+{
+
+	public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+	{
+		if (is_array($arguments))
+		{
+			$response->setBody(join(';', $arguments));
+		}
+		elseif (is_null($arguments))
+		{
+			$response->setBody('Is null');
+		}
+		else
+		{
+			$response->setBody('Something else');
+		}
+		return $response;
+	}
+
+	public function before(RequestInterface $request, $arguments = null)
+	{
+		if (is_array($arguments))
+		{
+			return join(';', $arguments);
+		}
+		elseif (is_null($arguments))
+		{
+			return 'Is null';
+		}
+		else
+		{
+			return 'Something else';
+		}
+	}
+
+}
diff --git a/user_guide_src/source/changelogs/v4.0.4.rst b/user_guide_src/source/changelogs/v4.0.4.rst
@@ -54,6 +54,8 @@ Bugs Fixed:
 - Fixed bug in Image GD handler that would try to compress images twice in certain cases
 - Ensure get translation output logic work on selected locale, dashed locale, and fallback "en"
 - Fix is_unique/is_not_unique validation called on POST/PUT via API in Postgresql
+- Added ``$arguments`` parameter to after() and before() in FilterInterface. This is a breaking change, so all code implementing the FilterInterface must be updated
+- Fixed a bug where filter arguments were not passed to after()
 
 
 
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
@@ -35,14 +35,14 @@ but may leave the methods empty if they are not needed. A skeleton filter class
 
     class MyFilter implements FilterInterface
     {
-        public function before(RequestInterface $request)
+        public function before(RequestInterface $request, $arguments = null)
         {
             // Do something here
         }
 
         //--------------------------------------------------------------------
 
-        public function after(RequestInterface $request, ResponseInterface $response)
+        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
         {
             // Do something here
         }
@@ -58,7 +58,7 @@ Since before filters are executed prior to your controller being executed, you m
 actions in the controller from happening. You can do this by passing back anything that is not the request object.
 This is typically used to perform redirects, like in this example::
 
-    public function before(RequestInterface $request)
+    public function before(RequestInterface $request, $arguments = null)
     {
         $auth = service('auth');
 
@@ -179,6 +179,15 @@ a list of URI patterns that filter should apply to::
         'bar' => ['before' => ['api/*', 'admin/*']]
     ];
 
+Filter arguments
+=================
+
+When configuring filters, additional arguments may be passed to a filter when setting up the route::
+
+    $routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+
+In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods.
+
 ****************
 Provided Filters
 ****************
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@`
`57`	`57`	`*/`
`58`	`58`	`class CSRF implements FilterInterface`
`59`	`59`	`{`
	`60`	`+`
`60`	`61`	`/**`
`61`	`62`	`* Do whatever processing this filter needs to do.`
`62`	`63`	`* By default it should not return anything during`
`@@ -68,11 +69,12 @@ class CSRF implements FilterInterface`
`68`	`69`	`* redirects, etc.`
`69`	`70`	`*`
`70`	`71`	`* @param RequestInterface\|\CodeIgniter\HTTP\IncomingRequest $request`
	`72`	`+ * @param array\|null $arguments`
`71`	`73`	`*`
`72`	`74`	`* @return mixed`
`73`	`75`	`* @throws \CodeIgniter\Security\Exceptions\SecurityException`
`74`	`76`	`*/`
`75`		`- public function before(RequestInterface $request)`
	`77`	`+ public function before(RequestInterface $request, $arguments = null)`
`76`	`78`	`{`
`77`	`79`	`if ($request->isCLI())`
`78`	`80`	`{`
`@@ -103,10 +105,11 @@ public function before(RequestInterface $request)`
`103`	`105`	`*`
`104`	`106`	`* @param RequestInterface\|\CodeIgniter\HTTP\IncomingRequest $request`
`105`	`107`	`* @param ResponseInterface\|\CodeIgniter\HTTP\Response $response`
	`108`	`+ * @param array\|null $arguments`
`106`	`109`	`*`
`107`	`110`	`* @return mixed`
`108`	`111`	`*/`
`109`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`112`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`110`	`113`	`{`
`111`	`114`	`}`
`112`	`115`
Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,16 @@`
`48`	`48`	`*/`
`49`	`49`	`class DebugToolbar implements FilterInterface`
`50`	`50`	`{`
	`51`	`+`
`51`	`52`	`/**`
`52`	`53`	`* We don't need to do anything here.`
`53`	`54`	`*`
`54`	`55`	`* @param RequestInterface\|\CodeIgniter\HTTP\IncomingRequest $request`
	`56`	`+ * @param array\|null $arguments`
`55`	`57`	`*`
`56`	`58`	`* @return void`
`57`	`59`	`*/`
`58`		`- public function before(RequestInterface $request)`
	`60`	`+ public function before(RequestInterface $request, $arguments = null)`
`59`	`61`	`{`
`60`	`62`	`}`
`61`	`63`
`@@ -67,10 +69,11 @@ public function before(RequestInterface $request)`
`67`	`69`	`*`
`68`	`70`	`* @param RequestInterface\|\CodeIgniter\HTTP\IncomingRequest $request`
`69`	`71`	`* @param ResponseInterface\|\CodeIgniter\HTTP\Response $response`
	`72`	`+ * @param array\|null $arguments`
`70`	`73`	`*`
`71`	`74`	`* @return void`
`72`	`75`	`*/`
`73`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`76`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`74`	`77`	`{`
`75`	`78`	`Services::toolbar()->prepare($request, $response);`
`76`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,11 @@ interface FilterInterface`
`59`	`59`	`* redirects, etc.`
`60`	`60`	`*`
`61`	`61`	`* @param \CodeIgniter\HTTP\RequestInterface $request`
	`62`	`+ * @param null $arguments`
`62`	`63`	`*`
`63`	`64`	`* @return mixed`
`64`	`65`	`*/`
`65`		`- public function before(RequestInterface $request);`
	`66`	`+ public function before(RequestInterface $request, $arguments = null);`
`66`	`67`
`67`	`68`	`//--------------------------------------------------------------------`
`68`	`69`
`@@ -74,10 +75,11 @@ public function before(RequestInterface $request);`
`74`	`75`	`*`
`75`	`76`	`* @param \CodeIgniter\HTTP\RequestInterface $request`
`76`	`77`	`* @param \CodeIgniter\HTTP\ResponseInterface $response`
	`78`	`+ * @param null $arguments`
`77`	`79`	`*`
`78`	`80`	`* @return mixed`
`79`	`81`	`*/`
`80`		`- public function after(RequestInterface $request, ResponseInterface $response);`
	`82`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);`
`81`	`83`
`82`	`84`	`//--------------------------------------------------------------------`
`83`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public function run(string $uri, string $position = 'before')`
`196`	`196`	`}`
`197`	`197`	`elseif ($position === 'after')`
`198`	`198`	`{`
`199`		`- $result = $class->after($this->request, $this->response);`
	`199`	`+ $result = $class->after($this->request, $this->response, $this->arguments[$alias] ?? null);`
`200`	`200`
`201`	`201`	`if ($result instanceof ResponseInterface)`
`202`	`202`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ class Honeypot implements FilterInterface`
`55`	`55`	`* then the requester is a bot`
`56`	`56`	`*`
`57`	`57`	`* @param \CodeIgniter\HTTP\RequestInterface $request`
	`58`	`+ * @param array\|null $arguments`
`58`	`59`	`*`
`59`	`60`	`* @return void`
`60`		`- * @throws \CodeIgniter\Honeypot\Exceptions\HoneypotException`
`61`	`61`	`*/`
`62`		`- public function before(RequestInterface $request)`
	`62`	`+ public function before(RequestInterface $request, $arguments = null)`
`63`	`63`	`{`
`64`	`64`	`$honeypot = Services::honeypot(new \Config\Honeypot());`
`65`	`65`	`if ($honeypot->hasContent($request))`
`@@ -73,10 +73,11 @@ public function before(RequestInterface $request)`
`73`	`73`	`*`
`74`	`74`	`* @param \CodeIgniter\HTTP\RequestInterface $request`
`75`	`75`	`* @param \CodeIgniter\HTTP\ResponseInterface $response`
	`76`	`+ * @param array\|null $arguments`
`76`	`77`	`*`
`77`	`78`	`* @return void`
`78`	`79`	`*/`
`79`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`80`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`80`	`81`	`{`
`81`	`82`	`$honeypot = Services::honeypot(new \Config\Honeypot());`
`82`	`83`	`$honeypot->attachHoneypot($response);`
Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@`
`7`	`7`	`class GoogleCurious implements FilterInterface`
`8`	`8`	`{`
`9`	`9`
`10`		`- public function before(RequestInterface $request)`
	`10`	`+ public function before(RequestInterface $request, $arguments = null)`
`11`	`11`	`{`
`12`	`12`	`return 'This is curious';`
`13`	`13`	`}`
`14`	`14`
`15`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`15`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`16`	`16`	`{`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@`
`7`	`7`	`class GoogleEmpty implements FilterInterface`
`8`	`8`	`{`
`9`	`9`
`10`		`- public function before(RequestInterface $request)`
	`10`	`+ public function before(RequestInterface $request, $arguments = null)`
`11`	`11`	`{`
`12`	`12`	`$request = '';`
`13`	`13`	`return $request;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`16`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`17`	`17`	`{`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class GoogleMe implements FilterInterface`
`8`	`8`	`{`
`9`		`- public function before(RequestInterface $request)`
	`9`	`+ public function before(RequestInterface $request, $arguments = null)`
`10`	`10`	`{`
`11`	`11`	`$request->url = 'http://google.com';`
`12`	`12`
`@@ -15,7 +15,7 @@ public function before(RequestInterface $request)`
`15`	`15`
`16`	`16`	`//--------------------------------------------------------------------`
`17`	`17`
`18`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`18`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`19`	`19`	`{`
`20`	`20`	`$response->csp = 'http://google.com';`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,14 @@`
`8`	`8`	`class GoogleYou implements FilterInterface`
`9`	`9`	`{`
`10`	`10`
`11`		`- public function before(RequestInterface $request)`
	`11`	`+ public function before(RequestInterface $request, $arguments = null)`
`12`	`12`	`{`
`13`	`13`	`$response = Services::response();`
`14`	`14`	`$response->csp = 'http://google.com';`
`15`	`15`	`return $response;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function after(RequestInterface $request, ResponseInterface $response)`
	`18`	`+ public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)`
`19`	`19`	`{`
`20`	`20`	`}`
`21`	`21`