diff --git a/app/Bootstrap/ViewComposer.php b/app/Bootstrap/ViewComposer.php index 16ca2d5..bdfd07d 100644 --- a/app/Bootstrap/ViewComposer.php +++ b/app/Bootstrap/ViewComposer.php @@ -6,6 +6,7 @@ use DI\Container; use PHLAK\Config\Config; use Slim\Views\Twig; use Twig\Extension\CoreExtension; +use Twig\Loader\FilesystemLoader; use Twig\TwigFunction; class ViewComposer @@ -43,7 +44,7 @@ class ViewComposer */ public function __invoke(): void { - $twig = new Twig('app/resources/views'); + $twig = new Twig(new FilesystemLoader('app/resources/views')); $twig->getEnvironment()->setCache( $this->config->get('view.cache', 'app/cache/views') diff --git a/composer.lock b/composer.lock index c781836..e19e498 100644 --- a/composer.lock +++ b/composer.lock @@ -863,22 +863,22 @@ }, { "name": "slim/slim", - "version": "4.3.0", + "version": "4.4.0", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "26020e9a099e69b0b12918115894f7106364dcb7" + "reference": "207acac048652a35d4762a737d59e317aedc02df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/26020e9a099e69b0b12918115894f7106364dcb7", - "reference": "26020e9a099e69b0b12918115894f7106364dcb7", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/207acac048652a35d4762a737d59e317aedc02df", + "reference": "207acac048652a35d4762a737d59e317aedc02df", "shasum": "" }, "require": { "ext-json": "*", "nikic/fast-route": "^1.3", - "php": "^7.1", + "php": "^7.2", "psr/container": "^1.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.0", @@ -886,29 +886,30 @@ "psr/http-server-middleware": "^1.0" }, "require-dev": { + "adriansuter/php-autoload-override": "^1.0", "ext-simplexml": "*", "guzzlehttp/psr7": "^1.5", "http-interop/http-factory-guzzle": "^1.0", + "laminas/laminas-diactoros": "^2.1", "nyholm/psr7": "^1.1", "nyholm/psr7-server": "^0.3.0", - "phpspec/prophecy": "^1.8", + "phpspec/prophecy": "^1.10", "phpstan/phpstan": "^0.11.5", - "phpunit/phpunit": "^7.5", + "phpunit/phpunit": "^8.5", "slim/http": "^0.7", "slim/psr7": "^0.3", - "squizlabs/php_codesniffer": "^3.4.2", - "zendframework/zend-diactoros": "^2.1" + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", "ext-xml": "Needed to support XML format in BodyParsingMiddleware", - "slim/psr7": "Slim PSR-7 implementation. See http://www.slimframework.com/docs/v4/start/installation.html for more information." + "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim", + "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information." }, "type": "library", "autoload": { "psr-4": { - "Slim\\": "Slim", - "Slim\\Tests\\": "tests" + "Slim\\": "Slim" } }, "notification-url": "https://packagist.org/downloads/", @@ -950,7 +951,7 @@ "micro", "router" ], - "time": "2019-10-05T21:24:58+00:00" + "time": "2020-01-05T03:51:47+00:00" }, { "name": "slim/twig-view", diff --git a/package-lock.json b/package-lock.json index 632ad1d..2f7654d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8192,9 +8192,9 @@ "dev": true }, "sass": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.24.0.tgz", - "integrity": "sha512-1TsPyMhLTx+9DLlmwg02iBW2p4poGA7LlkWJLpUY/XticFKNhPcx+l4FsIJLKl6oSUfXmAKpVljHEez1hwjqiw==", + "version": "1.24.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.24.2.tgz", + "integrity": "sha512-0JxdMMRd0fOmGFQFRI91vh4n0Ed766ib9JwPUa+1C37zn3VaqlHxbknUn/6LqP/MSfvNPxRYoCrYf5g8vu4OHw==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" diff --git a/package.json b/package.json index 605c798..55e7e92 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "laravel-mix": "^5.0.1", "laravel-mix-purgecss": "^4.2.0", "resolve-url-loader": "^3.1.1", - "sass": "^1.24.0", + "sass": "^1.24.2", "sass-loader": "^8.0.0", "tailwindcss": "^1.1.4", "vue-template-compiler": "^2.6.11"