From f9eca301d47a328cee6ee6be6df5f205b2bc95d9 Mon Sep 17 00:00:00 2001
From: Stian <stian@dekode.no>
Date: Tue, 12 Nov 2019 15:16:31 +0100
Subject: [PATCH] Rename app to content, Closes #25

---
 .gitignore                                             | 10 +++++-----
 INSTALLATION.md                                        |  4 ++--
 composer.json                                          | 10 +++++-----
 config/application.php                                 |  2 +-
 phpcs.xml                                              |  8 ++++----
 .../mu-plugins/register-theme-directory.php            |  0
 6 files changed, 17 insertions(+), 17 deletions(-)
 rename web/{app => content}/mu-plugins/register-theme-directory.php (100%)

diff --git a/.gitignore b/.gitignore
index a5c9217..c8efcde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,17 +13,17 @@ wp
 /composer.lock
 
 # Language files
-web/app/languages
+web/content/languages
 
 # Plugins
-web/app/plugins
+web/content/plugins
 
 # Themes
-web/app/themes/teft-theme
+web/content/themes/teft-theme
 
 # Upgrade and uploads
-web/app/upgrade
-web/app/uploads
+web/content/upgrade
+web/content/uploads
 
 # Dotenv
 .env
diff --git a/INSTALLATION.md b/INSTALLATION.md
index aa61f4e..17593b7 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -44,7 +44,7 @@ Much of the philosophy behind Bedrock is inspired by the [Twelve-Factor App](htt
 
   Or, you can cut and paste from the [Roots WordPress Salt Generator][roots-wp-salt].
 
-3. Add theme(s) in `web/app/themes` as you would for a normal WordPress site.
+3. Add theme(s) in `web/content/themes` as you would for a normal WordPress site.
 
 4. Set your site vhost document root to `/path/to/site/web/` (`/path/to/site/current/web/` if using deploys)
 
@@ -55,7 +55,7 @@ Much of the philosophy behind Bedrock is inspired by the [Twelve-Factor App](htt
 1. Create a new site in the Local app using Custom settings.
 
   Note that if you use preferred settings, the setup script will fail because preferred does not create the `/conf` folder required by teft-base.
-  
+
 2. `cd` to the `/app/` folder and `rm -r public` to remove the WordPress files automatically generated by Local.
 
 3. Follow the normal installation instructions.
diff --git a/composer.json b/composer.json
index b287e68..8bf117d 100644
--- a/composer.json
+++ b/composer.json
@@ -41,13 +41,13 @@
   "extra": {
     "wordpress-install-dir": "web/wp",
     "installer-paths": {
-      "web/app/mu-plugins/{$name}/": [ "type:wordpress-muplugin" ],
-      "web/app/plugins/{$name}/": [ "type:wordpress-plugin" ],
-      "web/app/themes/{$name}/": [ "type:wordpress-theme" ]
+      "web/content/mu-plugins/{$name}/": [ "type:wordpress-muplugin" ],
+      "web/content/plugins/{$name}/": [ "type:wordpress-plugin" ],
+      "web/content/themes/{$name}/": [ "type:wordpress-theme" ]
     },
     "dropin-paths": {
-      "web/app/languages/": [ "vendor:koodimonni-language" ],
-      "web/app/languages/plugins/": [ "vendor:koodimonni-plugin-language" ]
+      "web/content/languages/": [ "vendor:koodimonni-language" ],
+      "web/content/languages/plugins/": [ "vendor:koodimonni-plugin-language" ]
     }
   },
   "scripts": {
diff --git a/config/application.php b/config/application.php
index 564ea54..d4fdb6e 100644
--- a/config/application.php
+++ b/config/application.php
@@ -48,7 +48,7 @@
 /**
  * Custom Content Directory
  */
-define( 'CONTENT_DIR', '/app' );
+define( 'CONTENT_DIR', '/content' );
 define( 'WP_CONTENT_DIR', $webroot_dir . CONTENT_DIR );
 define( 'WP_CONTENT_URL', WP_HOME . CONTENT_DIR );
 
diff --git a/phpcs.xml b/phpcs.xml
index 569ee8e..7d83da1 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,8 +6,8 @@
 	<rule ref="Dekode" />
 
 	<exclude-pattern>web/wp</exclude-pattern>
-	<exclude-pattern>web/app/languages</exclude-pattern>
-	<exclude-pattern>web/app/plugins</exclude-pattern>
-	<exclude-pattern>web/app/uploads</exclude-pattern>
-	<exclude-pattern>web/app/themes/teft-theme</exclude-pattern>
+	<exclude-pattern>web/content/languages</exclude-pattern>
+	<exclude-pattern>web/content/plugins</exclude-pattern>
+	<exclude-pattern>web/content/uploads</exclude-pattern>
+	<exclude-pattern>web/content/themes/teft-theme</exclude-pattern>
 </ruleset>
diff --git a/web/app/mu-plugins/register-theme-directory.php b/web/content/mu-plugins/register-theme-directory.php
similarity index 100%
rename from web/app/mu-plugins/register-theme-directory.php
rename to web/content/mu-plugins/register-theme-directory.php