diff options
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | contrib/docker-compose.yml | 1 | ||||
| -rw-r--r-- | resources/views/pages/login.twig | 8 | ||||
| -rw-r--r-- | storage/.gitignore | 4 | ||||
| -rw-r--r-- | storage/cache/.gitignore | 4 | ||||
| -rw-r--r-- | tests/Unit/Config/RoutesFileTest.php | 43 | ||||
| -rw-r--r-- | tests/Unit/Renderer/RendererServiceProviderTest.php | 12 | ||||
| -rw-r--r-- | tests/Unit/Renderer/TwigServiceProviderTest.php | 2 |
8 files changed, 62 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98ffd902..e14b1841 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ variables: MYSQL_PASSWORD: engelsystem MYSQL_HOST: mariadb MYSQL_RANDOM_ROOT_PASSWORD: "yes" + MYSQL_INITDB_SKIP_TZINFO: "yes" DOCROOT: /var/www/ stages: diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml index b1dab793..197e2281 100644 --- a/contrib/docker-compose.yml +++ b/contrib/docker-compose.yml @@ -39,7 +39,6 @@ services: - database volumes: db: {} - static: {} networks: internal: diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig index da6f4fdf..88326429 100644 --- a/resources/views/pages/login.twig +++ b/resources/views/pages/login.twig @@ -50,7 +50,7 @@ <div class="input-group"> <span class="input-group-addon input-lg">{{ m.glyphicon('lock') }}</span> <input class="form-control input-lg" id="form_password" - type="password" name="password" value="" placeholder="{{ __('Password') }}"> + type="password" name="password" value="" placeholder="{{ __('Password') }}"> </div> </div> @@ -93,8 +93,10 @@ </a> </div> </div> - </div> - {{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }} + <div class="col-md-12 text-center"> + {{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }} + </div> + </div> </div> {% endblock %} diff --git a/storage/.gitignore b/storage/.gitignore new file mode 100644 index 00000000..fa776e4d --- /dev/null +++ b/storage/.gitignore @@ -0,0 +1,4 @@ +/* +!/app +!/cache +!.gitignore diff --git a/storage/cache/.gitignore b/storage/cache/.gitignore index ea604cb2..b376bb75 100644 --- a/storage/cache/.gitignore +++ b/storage/cache/.gitignore @@ -1 +1,3 @@ -/routes.cache.php +/* +!/views +!.gitignore diff --git a/tests/Unit/Config/RoutesFileTest.php b/tests/Unit/Config/RoutesFileTest.php new file mode 100644 index 00000000..a1cb3117 --- /dev/null +++ b/tests/Unit/Config/RoutesFileTest.php @@ -0,0 +1,43 @@ +<?php + +namespace Engelsystem\Test\Unit\Config; + +use FastRoute\RouteCollector; +use PHPUnit\Framework\MockObject\MockObject; +use PHPUnit\Framework\TestCase; + +class RoutesFileTest extends TestCase +{ + /** + * @doesNotPerformAssertions + */ + public function testLoadRoutes() + { + /** @var RouteCollector|MockObject $route */ + $route = $this->getMockBuilder(RouteCollector::class) + ->disableOriginalConstructor() + ->onlyMethods(['addRoute']) + ->getMock(); + + $this->doesNotPerformAssertions(); + /** @see RouteCollector::addRoute */ + $route->expects($this->any()) + ->method('addRoute') + ->willReturnCallback(function ($httpMethod, $route, $handler) { + /** + * @param string|string[] $httpMethod + * @param string $route + * @param mixed $handler + */ + if (is_string($handler) || (is_array($handler) && is_string($handler[0]))) { + return; + } + + $this->fail( + sprintf('The route "%s %s" is not cacheable', implode(',', (array)$httpMethod), $route) + ); + }); + + require __DIR__ . '/../../../config/routes.php'; + } +} diff --git a/tests/Unit/Renderer/RendererServiceProviderTest.php b/tests/Unit/Renderer/RendererServiceProviderTest.php index 224e36d4..e655284d 100644 --- a/tests/Unit/Renderer/RendererServiceProviderTest.php +++ b/tests/Unit/Renderer/RendererServiceProviderTest.php @@ -67,15 +67,13 @@ class RendererServiceProviderTest extends ServiceProviderTest $app = $this->getApp(['get', 'tagged']); - $engines = [$engine1, $engine2]; - $this->setExpects($app, 'get', ['renderer'], $renderer); - $this->setExpects($app, 'tagged', ['renderer.engine'], $engines); + $this->setExpects($app, 'tagged', ['renderer.engine'], [$engine1, $engine2]); - $invocation = $renderer - ->expects($this->exactly(count($engines))) - ->method('addRenderer'); - call_user_func_array([$invocation, 'withConsecutive'], $engines); + $renderer + ->expects($this->exactly(2)) + ->method('addRenderer') + ->withConsecutive([$engine1], [$engine2]); $serviceProvider = new RendererServiceProvider($app); $serviceProvider->boot(); diff --git a/tests/Unit/Renderer/TwigServiceProviderTest.php b/tests/Unit/Renderer/TwigServiceProviderTest.php index 86dee1de..ee4cd971 100644 --- a/tests/Unit/Renderer/TwigServiceProviderTest.php +++ b/tests/Unit/Renderer/TwigServiceProviderTest.php @@ -82,7 +82,7 @@ class TwigServiceProviderTest extends ServiceProviderTest $twig->expects($this->exactly(2)) ->method('addExtension') - ->withConsecutive($firsExtension, $secondExtension); + ->withConsecutive([$firsExtension], [$secondExtension]); $serviceProvider = new TwigServiceProvider($app); $serviceProvider->boot(); |