Merge branch 'release/0.6.1'

eloquent · Oct 22, 2014 · baa1376 · baa1376
2 parents 45c84b1 + f02ea99
commit baa1376
Show file tree

Hide file tree

Showing 20 changed files with 247 additions and 253 deletions.
diff --git a/.travis.env b/.travis.env
@@ -1 +1 @@
-HNXjFjHzq5PPpooRsLe10NTc117F2SjLNzn+ZCnQxmzQdWXeHY+PlL9Nv7X2UIqxxeLddnBxzuJUmhucS7omG3dJ0q5yyf8ky3v3itBh/gd7C3mpIl5npFDSpxRFjksiQWHepISkHN5UeEivCy7ZGuF7N+QPOaiatcrLWVqCJ2s=
+W/NwiJDbrj6yiRmVsNAGYenJJjXVWTLhhi+0ykNVAJtq/akx+3HlE9WvrvUfGu+18o7VWHfFXdq8tln79SC873XKta7OYVqMRfdB+KxjIu1LWCEu5bD5AzGZ6vt/797XmYBMds02nyGVlFNY7fzF1QcWhFO0o+hrZKOj5cmmhIQ=
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 language: php
 
-php: ["5.3", "5.4", "5.5", "hhvm"]
+php: ["5.3", "5.4", "5.5", "5.6", "hhvm", "hhvm-nightly"]
 
 matrix:
-  allow_failures:
-    - php: hhvm
+    allow_failures: [{"php": "hhvm"}, {"php": "hhvm-nightly"}]
+    fast_finish: true
 
 env:
   global:
-    - ARCHER_PUBLISH_VERSION=5.5
-    - secure: "HNXjFjHzq5PPpooRsLe10NTc117F2SjLNzn+ZCnQxmzQdWXeHY+PlL9Nv7X2UIqxxeLddnBxzuJUmhucS7omG3dJ0q5yyf8ky3v3itBh/gd7C3mpIl5npFDSpxRFjksiQWHepISkHN5UeEivCy7ZGuF7N+QPOaiatcrLWVqCJ2s="
+    - ARCHER_PUBLISH_VERSION=5.6
+    - secure: "W/NwiJDbrj6yiRmVsNAGYenJJjXVWTLhhi+0ykNVAJtq/akx+3HlE9WvrvUfGu+18o7VWHfFXdq8tln79SC873XKta7OYVqMRfdB+KxjIu1LWCEu5bD5AzGZ6vt/797XmYBMds02nyGVlFNY7fzF1QcWhFO0o+hrZKOj5cmmhIQ="
 
 install:
   - ./.travis.install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Pathogen changelog
 
+## 0.6.1 (2014-10-22)
+
+- **[FIXED]** Path factories handle excessive separators like '/A///B///C'
+  ([#38] - thanks [@rixbeck]).
+
+[#38]: https://github.com/eloquent/pathogen/issues/38
+[@rixbeck]: https://github.com/rixbeck
+
 ## 0.6.0 (2014-02-19)
 
 - **[BC BREAK]** Path resolvers refactored:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,25 +8,18 @@ changes.
 
 All PHP code must adhere to the [PSR-2] standards.
 
+[PSR-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+
 ## Branching and pull requests
 
 As a guideline, please follow this process:
 
  1. [Fork the repository].
- 2. Create a topic branch for the change:
-    - New features should branch from **develop**.
-    - Bug fixes to existing versions should branch from **master**.
-    - Please ensure the branch is clearly labelled as a feature or fix.
+ 2. Create a topic branch for the change, branching from **develop**
+    (`git checkout -b branch-name develop`).
  3. Make the relevant changes.
- 4. [Squash] commits if necessary.
- 4. Submit a pull request to the **develop** branch.
-
-Please note this is a general guideline only. For more information on the
-branching structure please see the [git-flow cheatsheet].
-
-<!-- References -->
+ 4. [Squash] commits if necessary (`git rebase -i develop`).
+ 5. Submit a pull request to the **develop** branch.
 
-[Fork the repository](https://help.github.com/articles/fork-a-repo)
-[git-flow cheatsheet](http://danielkummer.github.com/git-flow-cheatsheet/)
-[PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
-[Squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
+[Fork the repository]: https://help.github.com/articles/fork-a-repo
+[Squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages
diff --git a/README.md b/README.md
@@ -2,15 +2,26 @@
 
 *General-purpose path library for PHP.*
 
-[![The most recent stable version is 0.6.0][version-image]][Semantic versioning]
+[![The most recent stable version is 0.6.1][version-image]][Semantic versioning]
 [![Current build status image][build-image]][Current build status]
 [![Current coverage status image][coverage-image]][Current coverage status]
 
+[build-image]: http://img.shields.io/travis/eloquent/pathogen/develop.svg "Current build status for the develop branch"
+[Current build status]: https://travis-ci.org/eloquent/pathogen
+[coverage-image]: http://img.shields.io/coveralls/eloquent/pathogen/develop.svg "Current test coverage for the develop branch"
+[Current coverage status]: https://coveralls.io/r/eloquent/pathogen
+[Semantic versioning]: http://semver.org/
+[version-image]: http://img.shields.io/:semver-0.6.1-yellow.svg "This project uses semantic versioning"
+
 ## Installation and documentation
 
 - Available as [Composer] package [eloquent/pathogen].
 - [API documentation] available.
 
+[API documentation]: http://lqnt.co/pathogen/artifacts/documentation/api/
+[Composer]: http://getcomposer.org/
+[eloquent/pathogen]: https://packagist.org/packages/eloquent/pathogen
+
 ## What is Pathogen?
 
 *Pathogen* is a library for path manipulation. *Pathogen* supports file system
@@ -167,6 +178,10 @@ function relativeOnly(RelativePathInterface $path)
 }
 ```
 
+[AbsolutePathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/AbsolutePathInterface.html
+[PathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/PathInterface.html
+[RelativePathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/RelativePathInterface.html
+
 ### Special paths
 
 The 'root' path is considered the top-most absolute path, and is represented as
@@ -238,6 +253,8 @@ $pathFoo = $factory->create('/path/to/foo');
 $pathBar = $factory->create('C:/path/to/bar');
 ```
 
+[PathFactoryInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/Factory/PathFactoryInterface.html
+
 ### Path resolution
 
 Resolution of a path involves taking a path which may be relative or absolute,
@@ -369,6 +386,10 @@ with static methods. The actual path class used will depend on the input. If it
 is necessary to type hint for a file system path, [FileSystemPathInterface] or
 one of its more specialized child interfaces should be used instead.
 
+[FileSystemPath]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/FileSystemPath.html
+[FileSystemPathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/FileSystemPathInterface.html
+[PlatformFileSystemPath]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/PlatformFileSystemPath.html
+
 ### Immutability of paths
 
 Paths in *Pathogen* are *immutable*, meaning that once they are created, they
@@ -411,11 +432,13 @@ $consumer = new ExampleConsumer;
 echo get_class($consumer->pathFactory()); // outputs 'Eloquent\Pathogen\FileSystem\Factory\FileSystemPathFactory'
 ```
 
+[traits]: http://php.net/traits
+
 #### Available dependency consumer traits
 
-- [PlatformFileSystemPathFactoryTrait]
-- [FileSystemPathFactoryTrait]
-- [PathFactoryTrait]
+- [PlatformFileSystemPathFactoryTrait](src/Eloquent/Pathogen/FileSystem/Factory/Consumer/PlatformFileSystemPathFactoryTrait.php)
+- [FileSystemPathFactoryTrait](src/Eloquent/Pathogen/FileSystem/Factory/Consumer/FileSystemPathFactoryTrait.php)
+- [PathFactoryTrait](src/Eloquent/Pathogen/Factory/Consumer/PathFactoryTrait.php)
 
 ## Usage examples
 
@@ -491,29 +514,3 @@ $pathWithReplacement = $path->replace(1, array('for', 'baz'), 2);
 
 echo $pathWithReplacement->string(); // outputs '/path/for/baz/bar'
 ```
-
-<!-- References -->
-
-[AbsolutePathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/AbsolutePathInterface.html
-[FileSystemPath]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/FileSystemPath.html
-[FileSystemPathFactoryTrait]: src/Eloquent/Pathogen/FileSystem/Factory/Consumer/FileSystemPathFactoryTrait.php
-[FileSystemPathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/FileSystemPathInterface.html
-[NormalizingPathResolverTrait]: src/Eloquent/Pathogen/Resolver/Consumer/NormalizingPathResolverTrait.php
-[PathFactoryInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/Factory/PathFactoryInterface.html
-[PathFactoryTrait]: src/Eloquent/Pathogen/Factory/Consumer/PathFactoryTrait.php
-[PathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/PathInterface.html
-[PathResolverTrait]: src/Eloquent/Pathogen/Resolver/Consumer/PathResolverTrait.php
-[PlatformFileSystemPath]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/FileSystem/PlatformFileSystemPath.html
-[PlatformFileSystemPathFactoryTrait]: src/Eloquent/Pathogen/FileSystem/Factory/Consumer/PlatformFileSystemPathFactoryTrait.php
-[RelativePathInterface]: http://lqnt.co/pathogen/artifacts/documentation/api/Eloquent/Pathogen/RelativePathInterface.html
-[traits]: http://php.net/traits
-
-[API documentation]: http://lqnt.co/pathogen/artifacts/documentation/api/
-[Composer]: http://getcomposer.org/
-[build-image]: http://img.shields.io/travis/eloquent/pathogen/develop.svg "Current build status for the develop branch"
-[Current build status]: https://travis-ci.org/eloquent/pathogen
-[coverage-image]: http://img.shields.io/coveralls/eloquent/pathogen/develop.svg "Current test coverage for the develop branch"
-[Current coverage status]: https://coveralls.io/r/eloquent/pathogen
-[eloquent/pathogen]: https://packagist.org/packages/eloquent/pathogen
-[Semantic versioning]: http://semver.org/
-[version-image]: http://img.shields.io/:semver-0.6.0-yellow.svg "This project uses semantic versioning"