Merge branch 'hotfix/1'

Close #1

Author: weierophinney

.gitattributes

@@ -2,8 +2,8 @@
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.travis.yml export-ignore
+/docs export-ignore
+/test export-ignore
 /composer.lock export-ignore
-/docs/ export-ignore
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
-/test/ export-ignore

.gitignore

@@ -1,4 +1,4 @@
-/clover.xml
-/coveralls-upload.json
-/phpunit.xml
-/vendor/
+vendor/
+clover.xml
+coveralls-upload.json
+phpunit.xml

.travis.yml

@@ -11,7 +11,6 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   include:
@@ -21,6 +20,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
@@ -31,6 +31,7 @@ matrix:
       env:
         - DEPS=locked
         - CS_CHECK=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7.0
       env:
         - DEPS=latest
@@ -59,7 +60,7 @@ before_install:
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.1.1 - 2017-11-21
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+Versions prior to 0.2.0 were released as the package "webimpress/zend-pimple-config".
+
+## 0.2.0 - 2017-11-21
 
 ### Added
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-pimple-config",
-    "description": "PSR-11 Pimple container configurator for Expressive applications",
+    "description": "PSR-11 Pimple container configurator for ZF and Expressive applications",
     "license": "BSD-3-Clause",
     "keywords": [
         "expressive",
@@ -11,9 +11,9 @@
         "psr-11"
     ],
     "support": {
-        "issues": "https://github.com/webimpress/zend-pimple-config/issues",
-        "source": "https://github.com/webimpress/zend-pimple-config",
-        "rss": "https://github.com/webimpress/zend-pimple-config/releases.atom",
+        "issues": "https://github.com/zendframework/zend-pimple-config/issues",
+        "source": "https://github.com/zendframework/zend-pimple-config",
+        "rss": "https://github.com/zendframework/zend-pimple-config/releases.atom",
         "slack": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
@@ -22,7 +22,7 @@
         "pimple/pimple": "^3.2.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.22 || ^6.3.1",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
@@ -54,5 +54,5 @@
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
         "upload-coverage": "coveralls -v"
     },
-    "homepage": "https://github.com/webimpress/zend-pimple-config"
+    "homepage": "https://github.com/zendframework/zend-pimple-config"
 }

composer.lock

@@ -11,7 +11,7 @@ read/subscribe to the following resources:
  - [Code of Conduct](CODE_OF_CONDUCT.md)
 
 If you are working on new features or refactoring
-[create a proposal](https://github.com/webimpress/zend-pimple-config/issues/new).
+[create a proposal](https://github.com/zendframework/zend-pimple-config/issues/new).
 
 ## RUNNING TESTS
 
@@ -20,7 +20,7 @@ To run tests:
 - Clone the repository:
 
   ```console
-  $ git clone git://github.com/webimpress/zend-pimple-config.git
+  $ git clone git://github.com/zendframework/zend-pimple-config.git
   $ cd zend-pimple-config
   ```
 
@@ -72,11 +72,11 @@ pull your work into the master repository. We recommend using
 [GitHub](https://github.com), as that is where the component is already hosted.
 
 1. Setup a [GitHub account](https://github.com/), if you haven't yet
-2. Fork the repository (https://github.com/webimpress/zend-pimple-config)
+2. Fork the repository (https://github.com/zendframework/zend-pimple-config)
 3. Clone the canonical repository locally and enter it.
 
    ```console
-   $ git clone git://github.com/webimpress/zend-pimple-config.git
+   $ git clone git://github.com/zendframework/zend-pimple-config.git
    $ cd zend-pimple-config
    ```
 

docs/CONTRIBUTING.md

@@ -1,4 +1,4 @@
- - [ ] I was not able to find an [open](https://github.com/webimpress/zend-pimple-config/issues?q=is%3Aopen) or [closed](https://github.com/webimpress/zend-pimple-config/issues?q=is%3Aclosed) issue matching what I'm seeing.
+ - [ ] I was not able to find an [open](https://github.com/zendframework/zend-pimple-config/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-pimple-config/issues?q=is%3Aclosed) issue matching what I'm seeing.
  - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
 
 Provide a narrative description of what you are trying to accomplish.

docs/ISSUE_TEMPLATE.md

@@ -7,7 +7,7 @@ Zend Framework offers three support channels:
 - For detailed questions (e.g., those requiring examples) use our
   [forums](https://discourse.zendframework.com/c/questions/components)
 - To report issues, use this repository's
-  [issue tracker](https://github.com/webimpress/zend-pimple-config/issues/new)
+  [issue tracker](https://github.com/zendframework/zend-pimple-config/issues/new)
 
 **DO NOT** use the issue tracker to ask questions; use Slack or the forums for
 that. Questions posed to the issue tracker will be closed.

docs/SUPPORT.md

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-pimple-config for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-pimple-config/blob/master/LICENSE.md New BSD License
  */