Merge branch 'release/2.2.8' into craft-webpack

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.2.8 - 2020.03.30
+### Changed
+* Remove project `composer.lock` file
+* Use separate app config files for web/console requests
+
 ## 2.2.7 - 2020.03.27
 ### Changed
 * Removed `SITE_NAME` from the `.env` vars; it's not a secret, and it doesn't change per environment

README.md

@@ -47,7 +47,7 @@ Make sure that `PATH` is the path to your project, including the name you want f
 
     composer create-project nystudio107/craft craft3
 
-## Setting Local Dev
+## Setting Up Local Dev
 
 You'll need Docker desktop for your platform installed to run the project in local development
 
@@ -56,12 +56,12 @@ You'll need Docker desktop for your platform installed to run the project in loc
 * Start up the site with `docker-compose up` (the first build will be somewhat lengthy)
 * On the first time setting it up, the `craft_php_1` container will fail; this is normal
 * Import the `seed_db.sql` database dump the first time from the `scripts/` dir with `./docker_restore_db.sh seed_db.sql`
-* Then hit ^C (Control-C) to stop the Docker containers, and restart them with `docker-compose up` and `craft_php_1` should then work properly, since the db has been seeded
+* Then hit `^C` (Control-C) to stop the Docker containers, and restart them with `docker-compose up` and `craft_php_1` should then work properly, since the db has been seeded
 * Navigate to `http://localhost:8000` to use the site; the `webpack-dev-server` runs off of `http://localhost:8080`
 
 The CP login credentials are initially set as follows:
 
-Login: `andrew@nystudio107.com`
+Login: `andrew@nystudio107.com` \
 Password: `letmein`
 
 Obviously change these to whatever you like as needed

cms/config/app.console.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * Yii Console Application Config
+ *
+ * Edit this file at your own risk!
+ *
+ * The array returned by this file will get merged with
+ * vendor/craftcms/cms/src/config/app.php and app.[web|console].php, when
+ * Craft's bootstrap script is defining the configuration for the entire
+ * application.
+ *
+ * You can define custom modules and system components, and even override the
+ * built-in system components.
+ *
+ * This application config is applied only for *only* console requests
+ */
+
+return [
+];

cms/config/app.php

@@ -5,12 +5,16 @@
  * Edit this file at your own risk!
  *
  * The array returned by this file will get merged with
- * vendor/craftcms/cms/src/config/app/main.php and [web|console].php, when
+ * vendor/craftcms/cms/src/config/app.php and app.[web|console].php, when
  * Craft's bootstrap script is defining the configuration for the entire
  * application.
  *
  * You can define custom modules and system components, and even override the
  * built-in system components.
+ *
+ * If you want to modify the application config for *only* web requests or
+ * *only* console requests, create an app.web.php or app.console.php file in
+ * your config/ folder, alongside this one.
  */
 
 return [
@@ -38,16 +42,5 @@
                 'database' => getenv('REDIS_CRAFT_DB'),
             ],
         ],
-        'session' => [
-            'class' => \yii\redis\Session::class,
-            'redis' => [
-                'hostname' => getenv('REDIS_HOSTNAME'),
-                'port' => getenv('REDIS_PORT'),
-                'database' => getenv('REDIS_CRAFT_DB'),
-            ],
-            'as session' => [
-                'class' => \craft\behaviors\SessionBehavior::class,
-            ],
-        ],
     ],
 ];

cms/config/app.web.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Yii Web Application Config
+ *
+ * Edit this file at your own risk!
+ *
+ * The array returned by this file will get merged with
+ * vendor/craftcms/cms/src/config/app.php and app.[web|console].php, when
+ * Craft's bootstrap script is defining the configuration for the entire
+ * application.
+ *
+ * You can define custom modules and system components, and even override the
+ * built-in system components.
+ *
+ * This application config is applied only for *only* web requests
+ */
+
+return [
+    'components' => [
+        'session' => [
+            'class' => \yii\redis\Session::class,
+            'redis' => [
+                'hostname' => getenv('REDIS_HOSTNAME'),
+                'port' => getenv('REDIS_PORT'),
+                'database' => getenv('REDIS_CRAFT_DB'),
+            ],
+            'as session' => [
+                'class' => \craft\behaviors\SessionBehavior::class,
+            ],
+        ],
+    ],
+];

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.7",
+  "version": "2.2.8",
   "keywords": [
     "craft",
     "cms",
@@ -39,6 +39,7 @@
       "@php -r \"copy('./cms/example.env', './cms/.env');\"",
       "@php -r \"copy('./scripts/example.env.sh', './scripts/.env.sh');\"",
       "@php -r \"unlink('composer.json');\"",
+      "@php -r \"unlink('composer.lock');\"",
       "@php -r \"unlink('LICENSE.md');\"",
       "@php -r \"unlink('README.md');\""
     ]