From ac12bfd7f3d814f70ccdf0b9477ed43bfb694d48 Mon Sep 17 00:00:00 2001 From: Alain ANDRE Date: Fri, 4 Aug 2017 12:48:47 +0000 Subject: [PATCH 1/3] Fixing composer.lock production warning on first install --- composer.lock | 64 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 1af82ce99..bf499f0fc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "cd7cfdd7652bf50a396d2210840bed8f", + "content-hash": "9e33f71764cc0630f0d478a87c7f749a", "packages": [ { "name": "fancyguy/webroot-installer", @@ -48,12 +48,62 @@ "homepage": "http://fancyguy.github.com/webroot-installer/", "time": "2013-01-29T22:51:45+00:00" }, + { + "name": "vlucas/phpdotenv", + "version": "v2.4.0", + "source": { + "type": "git", + "url": "https://github.com/vlucas/phpdotenv.git", + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", + "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "require-dev": { + "phpunit/phpunit": "^4.8 || ^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-4": { + "Dotenv\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause-Attribution" + ], + "authors": [ + { + "name": "Vance Lucas", + "email": "vance@vancelucas.com", + "homepage": "http://www.vancelucas.com" + } + ], + "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "time": "2016-09-01T10:05:43+00:00" + }, { "name": "wordpress", - "version": "4.7.3", + "version": "4.8", "dist": { "type": "zip", - "url": "https://github.com/WordPress/WordPress/archive/4.7.3.zip", + "url": "https://github.com/WordPress/WordPress/archive/4.8.zip", "reference": null, "shasum": null }, @@ -70,12 +120,12 @@ "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "e0499a7fdffd56f46534a037a6c48d65cef4e645" + "reference": "82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/e0499a7fdffd56f46534a037a6c48d65cef4e645", - "reference": "e0499a7fdffd56f46534a037a6c48d65cef4e645", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a", + "reference": "82b6fbf8d6a9693ec2f01ccf993202bfc1bc528a", "shasum": "" }, "bin": [ @@ -106,7 +156,7 @@ "nginx", "php" ], - "time": "2017-02-20 15:05:49" + "time": "2017-08-03T22:13:11+00:00" } ], "aliases": [], From e6413425e2aa83e1bfec1a0a8484d6481a4f6365 Mon Sep 17 00:00:00 2001 From: Alain ANDRE Date: Fri, 4 Aug 2017 12:49:53 +0000 Subject: [PATCH 2/3] Add a title for the manual installation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3015d1731..13976b4c6 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ Use the Deploy to Heroku button, or use the old fashioned way described below. [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) +### Old fashioned Clone this repository into a new directory. Create your Heroku app. From 3f28d5454a28663234f477ea11eb33f246de5b05 Mon Sep 17 00:00:00 2001 From: Alain ANDRE Date: Fri, 4 Aug 2017 12:50:32 +0000 Subject: [PATCH 3/3] Fixing Dotenv error in production --- public/wp-config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/wp-config.php b/public/wp-config.php index d0a7ae271..2ab3e1bc0 100644 --- a/public/wp-config.php +++ b/public/wp-config.php @@ -15,7 +15,7 @@ */ require_once(__DIR__ . '/../vendor/autoload.php'); -(new \Dotenv\Dotenv(__DIR__.'/../'))->load(); +if(!getenv("CLEARDB_DATABASE_URL")) (new \Dotenv\Dotenv(__DIR__.'/../'))->load(); if ( file_exists( dirname( __FILE__ ) . '/local-config.php' ) ) {