Bump recipe

maxhelias · maxhelias · commit 07dbee38d7ca · 2019-03-02T20:56:56.000+01:00
diff --git a/api/.env b/api/.env
@@ -1,7 +1,16 @@
-# This file defines all environment variables that the application needs.
-# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE.
-# Use ".env.local" for local overrides during development.
-# Use real environment variables when deploying to production.
+# In all environments, the following files are loaded if they exist,
+# the later taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 VARNISH_URL=http://cache-proxy
@@ -26,6 +35,5 @@ CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$
 
 ###> symfony/mercure-bundle ###
 MERCURE_PUBLISH_URL=http://mercure/hub
-MERCURE_SUBSCRIBE_URL=http://localhost:1337/hub
-MERCURE_JWT=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM
+MERCURE_JWT_SECRET=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InN1YnNjcmliZSI6WyJmb28iLCJiYXIiXSwicHVibGlzaCI6WyJmb28iXX19.LRLvirgONK13JgacQ_VbcjySbVhkSmHy3IznH3tA9PM
 ###< symfony/mercure-bundle ###
diff --git a/api/.gitignore b/api/.gitignore
@@ -2,13 +2,14 @@
 
 ###> symfony/framework-bundle ###
 /.env.local
+/.env.local.php
 /.env.*.local
 /public/bundles/
 /var/
 /vendor/
 ###< symfony/framework-bundle ###
 
 ###> friendsofphp/php-cs-fixer ###
-.php_cs
-.php_cs.cache
+/.php_cs
+/.php_cs.cache
 ###< friendsofphp/php-cs-fixer ###
diff --git a/api/config/packages/test/routing.yaml b/api/config/packages/test/routing.yaml
@@ -0,0 +1,3 @@
+framework:
+    router:
+        strict_requirements: true
diff --git a/api/src/Kernel.php b/api/src/Kernel.php
@@ -13,9 +13,9 @@ class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
 
-    const CONFIG_EXTS = '.{php,xml,yaml,yml}';
+    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         $contents = require $this->getProjectDir().'/config/bundles.php';
         foreach ($contents as $class => $envs) {
@@ -25,7 +25,7 @@ public function registerBundles()
         }
     }
 
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
     {
         $container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));
         $container->setParameter('container.dumper.inline_class_loader', true);
@@ -37,12 +37,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
         $loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes)
+    protected function configureRoutes(RouteCollectionBuilder $routes): void
     {
         $confDir = $this->getProjectDir().'/config';
 
-        $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
         $routes->import($confDir.'/{routes}/'.$this->environment.'/**/*'.self::CONFIG_EXTS, '/', 'glob');
+        $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
         $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
     }
 }
diff --git a/api/symfony.lock b/api/symfony.lock
diff --git a/update-deps.sh b/update-deps.sh

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+framework:`
	`2`	`+ router:`
	`3`	`+ strict_requirements: true`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ class Kernel extends BaseKernel`
`13`	`13`	`{`
`14`	`14`	`use MicroKernelTrait;`
`15`	`15`
`16`		`- const CONFIG_EXTS = '.{php,xml,yaml,yml}';`
	`16`	`+ private const CONFIG_EXTS = '.{php,xml,yaml,yml}';`
`17`	`17`
`18`		`- public function registerBundles()`
	`18`	`+ public function registerBundles(): iterable`
`19`	`19`	`{`
`20`	`20`	`$contents = require $this->getProjectDir().'/config/bundles.php';`
`21`	`21`	`foreach ($contents as $class => $envs) {`
`@@ -25,7 +25,7 @@ public function registerBundles()`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`
`28`		`- protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)`
	`28`	`+ protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void`
`29`	`29`	`{`
`30`	`30`	`$container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));`
`31`	`31`	`$container->setParameter('container.dumper.inline_class_loader', true);`
`@@ -37,12 +37,12 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa`
`37`	`37`	`$loader->load($confDir.'/{services}_'.$this->environment.self::CONFIG_EXTS, 'glob');`
`38`	`38`	`}`
`39`	`39`
`40`		`- protected function configureRoutes(RouteCollectionBuilder $routes)`
	`40`	`+ protected function configureRoutes(RouteCollectionBuilder $routes): void`
`41`	`41`	`{`
`42`	`42`	`$confDir = $this->getProjectDir().'/config';`
`43`	`43`
`44`		`- $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`45`	`44`	`$routes->import($confDir.'/{routes}/'.$this->environment.'/*/'.self::CONFIG_EXTS, '/', 'glob');`
	`45`	`+ $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');`
`46`	`46`	`$routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');`
`47`	`47`	`}`
`48`	`48`	`}`