Merge pull request #28 from bedita/feat/middleware-disabled-by-default

Middleware disabled by default

src/Middleware/I18nMiddleware.php

@@ -19,6 +19,7 @@
 use Cake\Core\InstanceConfigTrait;
 use Cake\Http\Cookie\Cookie;
 use Cake\Http\Exception\BadRequestException;
+use Cake\Http\Exception\InternalErrorException;
 use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\I18n;
@@ -176,6 +177,12 @@ protected function setupLocale(?string $locale): void
             $locale = array_search($lang, $locales);
         }
 
+        if ($lang === null || $locale === false) {
+            throw new InternalErrorException(
+                __('Something was wrong with I18n configuration. Check "I18n.locales" and "I18n.default"')
+            );
+        }
+
         Configure::write('I18n.lang', $lang);
         I18n::setLocale($locale);
     }

src/Plugin.php

@@ -39,6 +39,13 @@ class Plugin extends BasePlugin
      */
     protected $routesEnabled = false;
 
+    /**
+     * Enable middleware
+     *
+     * @var bool
+     */
+    protected $middlewareEnabled = false;
+
     /**
      * Setup the I8nMiddleware.
      *

tests/TestCase/Middleware/I18nMiddlewareTest.php

@@ -18,6 +18,7 @@
 use Cake\Core\Configure;
 use Cake\Http\Cookie\Cookie;
 use Cake\Http\Exception\BadRequestException;
+use Cake\Http\Exception\InternalErrorException;
 use Cake\Http\Response;
 use Cake\Http\ServerRequestFactory;
 use Cake\I18n\I18n;
@@ -336,6 +337,26 @@ public function testSetupLocale(array $expected, array $server): void
         static::assertEquals($expected['lang'], Configure::read('I18n.lang'));
     }
 
+    /**
+     * Test that an exception is raised if missing required conf.
+     *
+     * @return void
+     *
+     * @covers ::setupLocale()
+     */
+    public function testSetupLocaleMissingConfig(): void
+    {
+        $this->expectException(InternalErrorException::class);
+        $this->expectExceptionCode(500);
+
+        Configure::delete('I18n');
+        $request = ServerRequestFactory::fromGlobals([
+            'REQUEST_URI' => '/help',
+        ]);
+        $middleware = new I18nMiddleware();
+        $middleware->process($request, $this->requestHandler);
+    }
+
     /**
      * Test that if middleware is not configured properly the locale cookie is ignored.
      *

tests/bootstrap.php

@@ -70,4 +70,4 @@
 ConnectionManager::setConfig('test', ['url' => getenv('db_dsn')]);
 Router::reload();
 
-Plugin::getCollection()->add(new \BEdita\I18n\Plugin());
+Plugin::getCollection()->add(new \BEdita\I18n\Plugin(['middleware' => true]));