Merge pull request #6 from frankfoerster/cake-3.4-support

update test setup for cakephp 3.4.x

Author: frankfoerster

.travis.yml

@@ -2,8 +2,9 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
+  - 7.0
+  - 7.1
 
 sudo: false
 
@@ -15,10 +16,10 @@ matrix:
   fast_finish: true
 
   include:
-  - php: 5.5
+  - php: 7.1
     env: PHPCS=1 DEFAULT=0
 
-  - php: 5.5
+  - php: 7.1
     env: COVERALLS=1 DEFAULT=0
 
 install:
@@ -36,9 +37,9 @@ before_script:
   - set +H
 
 script:
-  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
+  - sh -c "if [ '$DEFAULT' = '1' ]; then ./vendor/bin/phpunit --stderr; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then ./vendor/bin/phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Frank Förster
+Copyright (c) 2014-2017 Frank Förster
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,46 +1,52 @@
-CakePHP 3.x Environment Plugin
-==============================
+# CakePHP 3.x Environment Plugin
 
-[![Build Status](https://travis-ci.org/frankfoerster/cakephp-environment.svg?branch=cake3)](https://travis-ci.org/frankfoerster/cakephp-environment)
+[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
+[![Build Status](https://img.shields.io/travis/frankfoerster/cakephp-environment/cake3.svg?style=flat-square)](https://travis-ci.org/frankfoerster/cakephp-environment)
+[![Coverage Status](https://img.shields.io/coveralls/frankfoerster/cakephp-environment/cake3.svg?style=flat-square)](https://coveralls.io/github/frankfoerster/cakephp-environment)
+[![Total Downloads](https://img.shields.io/packagist/dt/frankfoerster/cakephp-environment.svg?style=flat-square)](https://packagist.org/packages/frankfoerster/cakephp-environment)
+[![Latest Stable Version](https://img.shields.io/packagist/v/frankfoerster/cakephp-environment.svg?style=flat-square&label=stable)](https://packagist.org/packages/frankfoerster/cakephp-environment)
 
 Manage multiple environments in your CakePHP application that differ in, e.g.:
 
 - database setup
 - configuration settings (Configure)
 - custom feature flags
 
-Requirements
-------------
+## Requirements
 
-- PHP 5.4.16+
+- PHP 5.6.0+
 - CakePHP 3.x
 
-1. What it does
----------------
+## What it does
 
 The Environment plugin hooks into your bootstrap process to initialize the database configuration, configuration parameters and additional custom logic for different environments.
 
 An environment is defined and detected either by a set of domains (e.g. www.domain.com, domain.com, domain.net) or optionally by the absolute app path on a server (cli).
 
-2. Install and use the plugin
------------------------------
-
-1. `composer require frankfoerster/cakephp-environment`
-2. Copy the example configuration files from `example/config/Environment` to your app `/config/Environment`
-3. Add the following lines to your `config/bootstrap.php` file
-   
-   ```php
-   use FrankFoerster\Environment\Environments;
-   
-   Plugin::load('FrankFoerster/Environment');
-   Environments::init();
-   ```
+## Install and use the plugin
+
+1.  `composer require frankfoerster/cakephp-environment`
+2.  Copy the example configuration files from `example/config/Environment` to your app `/config/Environment`
+3.  Add the following lines to your `config/bootstrap.php` file
+    
+    ```php
+    use FrankFoerster\Environment\Environments;
+    
+    Plugin::load('FrankFoerster/Environment');
+    Environments::init();
+    ```
+    
+    before
+    ```php
+    ConnectionManager::config(Configure::consume('Datasources'));
+    ```
+
+    If you want to setup environment specific settings for any "consumed" configuration option, then make sure your environments are initialized  **before** the corresponding ``Configure::consume('...')`` call.
 
 Tags ~1.0 are releases for CakePHP 2.x support (master branch).  
 Tags ~3.0 are releases for CakePHP 3.x support (cake3 branch).
 
-3. Configuration
-----------------
+## Configuration
 
 The configuration of your environments is managed with multiple files.
 

composer.json

@@ -18,11 +18,11 @@
     }
   ],
   "require": {
-    "php": ">=5.3.0"
+    "php": ">=5.6.0"
   },
   "require-dev": {
-    "cakephp/cakephp": "~3.0",
-    "phpunit/phpunit": "~4.6",
+    "cakephp/cakephp": "3.4.*",
+    "phpunit/phpunit": "~5.7",
     "cakephp/cakephp-codesniffer": "dev-master"
   },
   "autoload": {

phpunit.xml.dist

@@ -18,4 +18,12 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+        <blacklist>
+            <directory suffix=".php">./vendor</directory>
+        </blacklist>
+    </filter>
 </phpunit>

src/Environments.php

@@ -128,6 +128,7 @@ public static function init()
     public static function getCurrentEnvironment()
     {
         $instance = self::getInstance();
+
         return $instance->_current;
     }
 
@@ -152,6 +153,7 @@ protected function _loadEnvironment($envFilePath)
                 return $availableEnvironments;
             }
         }
+
         return [];
     }
 
@@ -221,6 +223,7 @@ protected function _getRealAppPath()
         if (substr($path, -1, 1) !== DS) {
             $path .= DS;
         }
+
         return $path;
     }
 
@@ -234,6 +237,7 @@ public static function getInstance()
         if (static::$_instance === null) {
             static::$_instance = new Environments();
         }
+
         return static::$_instance;
     }
 

tests/TestCase/EnvironmentsTest.php

@@ -25,12 +25,14 @@ class EnvironmentsTestWrapper extends Environments
     public static function getEnvPath()
     {
         $instance = self::getInstance();
+
         return $instance->_envPath;
     }
 
     public static function getEnvironment()
     {
         $instance = self::getInstance();
+
         return $instance->_getEnvironment();
     }
 
@@ -120,6 +122,21 @@ public function testHostEnvironmentDetection()
         $_SERVER['HTTP_HOST'] = $backup;
     }
 
+    public function testServerNameEnvironmentDetection()
+    {
+        Environments::tearDown();
+        EnvironmentsTestWrapper::prepareTestEnvironments();
+
+        $hostBackup = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+        $serverNameBackup = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost';
+        $_SERVER['HTTP_HOST'] = null;
+        $_SERVER['SERVER_NAME'] = 'test.com';
+        $this->assertEquals('testing', EnvironmentsTestWrapper::getEnvironment());
+
+        $_SERVER['HTTP_HOST'] = $hostBackup;
+        $_SERVER['SERVER_NAME'] = $serverNameBackup;
+    }
+
     public function testPathEnvironmentDetection()
     {
         Environments::tearDown();