Merge remote-tracking branch 'refs/remotes/origin/dev'

Author: gmazzap

wpstarter/src/Setup/Salter.php

@@ -40,7 +40,7 @@ public function keys()
         if (! is_array($this->result)) {
             $this->result = array();
             foreach (self::$keys as $key) {
-                $this->result[$key] = $this->buildKey(54);
+                $this->result[$key] = $this->buildKey(64);
             }
         }
 
@@ -55,10 +55,10 @@ public function keys()
      */
     private function buildKey($length)
     {
-        $chars = '=,.;:/?|abcdefghijklmnopqrstuvwxyz!@#$%^&*()ABCDEFGHIJKLMNOPQRSTUVWXYZ-_[]{}<>~`+0123456789';
+        $chars = ' =,.;:/?!|@#$%^&*()-_[]{}<>~`+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
         $key = '';
         for ($i = 0; $i < $length; $i++) {
-            $rand = mt_rand(0, 90);
+            $rand = mt_rand(0, 91);
             $key .= $chars[$rand];
         }
 

wpstarter/templates/wp-config.example

@@ -1,10 +1,11 @@
 <?php
 /**
- * This file is generated by WP Starter Package, and contains base configurations of the WordPress.
+ * This file is generated by WP Starter package, and contains base configuration of the WordPress.
  *
- * All the configuration constants used by WordPress are set via .env file.
+ * All the configuration constants used by WordPress are set via environment variables.
  * Default settings are provided in this file for most common settings, however database settings
  * are required, you can get them from your web host.
+ *
  * A sample .env file (.env.example) should be placed in the root of your project, rename it to .env
  * and edit it according to your needs.
  */
@@ -17,13 +18,13 @@ require_once realpath({{{VENDOR_PATH}}}.'/autoload.php');
 /**
  * Configuration constants.
  *
- * Use .env file to set WordPress constants.
+ * Use environment variables to set WordPress constants.
  * Mandatory settings:
  * - DB_NAME
  * - DB_USER
  * - DB_PASSWORD
  *
- * @var array $env All the variables stored in .env file
+ * @var array $env All the variables stored in environment variables
  */
 $env = WCM\WPStarter\Helpers::settings({{{ENV_REL_PATH}}}, '{{{ENV_FILE_NAME}}}');
 array_walk($env, function ($value, $name) {
@@ -54,24 +55,21 @@ if (! isset($table_prefix) || empty($table_prefix)) {
 }
 
 /**
- * Set unique authentication keys if not already set via .env file.
- * If available, environment name is mixed to keys so they become unique per environment.
+ * Set unique authentication keys if not already set via environment variables.
  */
-$environment = getenv('WORDPRESS_ENV');
-$pre = $environment  ? substr($environment, 0, 5)  : substr('{{{AUTH_KEY}}}', 0, 5);
-$post = $environment ? substr($environment, -5, 5) : substr('{{{SECURE_AUTH_KEY}}}', 0, 5);
-defined('AUTH_KEY')         or define('AUTH_KEY',         $pre.'{{{AUTH_KEY}}}'.$post);
-defined('SECURE_AUTH_KEY')  or define('SECURE_AUTH_KEY',  $pre.'{{{SECURE_AUTH_KEY}}}'.$post);
-defined('LOGGED_IN_KEY')    or define('LOGGED_IN_KEY',    $pre.'{{{LOGGED_IN_KEY}}}'.$post);
-defined('NONCE_KEY')        or define('NONCE_KEY',        $pre.'{{{NONCE_KEY}}}'.$post);
-defined('AUTH_SALT')        or define('AUTH_SALT',        $pre.'{{{AUTH_SALT}}}'.$post);
-defined('SECURE_AUTH_SALT') or define('SECURE_AUTH_SALT', $pre.'{{{SECURE_AUTH_SALT}}}'.$post);
-defined('LOGGED_IN_SALT')   or define('LOGGED_IN_SALT',   $pre.'{{{LOGGED_IN_SALT}}}'.$post);
-defined('NONCE_SALT')       or define('NONCE_SALT',       $pre.'{{{NONCE_SALT}}}'.$post);
+defined('AUTH_KEY')         or define('AUTH_KEY',         '{{{AUTH_KEY}}}');
+defined('SECURE_AUTH_KEY')  or define('SECURE_AUTH_KEY',  '{{{SECURE_AUTH_KEY}}}');
+defined('LOGGED_IN_KEY')    or define('LOGGED_IN_KEY',    '{{{LOGGED_IN_KEY}}}');
+defined('NONCE_KEY')        or define('NONCE_KEY',        '{{{NONCE_KEY}}}');
+defined('AUTH_SALT')        or define('AUTH_SALT',        '{{{AUTH_SALT}}}');
+defined('SECURE_AUTH_SALT') or define('SECURE_AUTH_SALT', '{{{SECURE_AUTH_SALT}}}');
+defined('LOGGED_IN_SALT')   or define('LOGGED_IN_SALT',   '{{{LOGGED_IN_SALT}}}');
+defined('NONCE_SALT')       or define('NONCE_SALT',       '{{{NONCE_SALT}}}');
 
 /**
  * Environment-aware settings. Be creative, but avoid to set sensitive settings here.
  */
+$environment = getenv('WORDPRESS_ENV');
 switch ($environment) {
 
     case 'development':
@@ -112,7 +110,7 @@ if (
 }
 
 /**
- * Set WordPress paths and urls if not set via .env file.
+ * Set WordPress paths and urls if not set via environment variables.
  */
 if (! defined('WP_HOME')) {
     $server = filter_input_array(INPUT_SERVER, array(
@@ -133,7 +131,7 @@ defined('WP_CONTENT_URL') or define('WP_CONTENT_URL', rtrim(WP_HOME, '/').'/{{{W
 /**
  * Clean up.
  */
-unset($env, $environment, $pre, $post, $server, $secure, $scheme, $name);
+unset($env, $environment, $server, $secure, $scheme, $name);
 
 /**
  * Allows to load MU plugins in subfolders.