Skip to content
This repository has been archived by the owner on Nov 26, 2022. It is now read-only.

Commit

Permalink
Prepare 1.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
nyamsprod committed Sep 25, 2017
1 parent 2d7b6a7 commit 4e01703
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ sudo: false
matrix:
include:
- php: 7.0
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true IGNORE_PLATFORMS=false
- php: 7.1
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=false
env: COLLECT_COVERAGE=true VALIDATE_CODING_STYLE=true IGNORE_PLATFORMS=false
- php: master
env: COLLECT_COVERAGE=false VALIDATE_CODING_STYLE=false IGNORE_PLATFORMS=true
allow_failures:
- php: master
fast_finish: true

cache:
Expand All @@ -18,7 +22,8 @@ before_install:
- travis_retry composer self-update

install:
- travis_retry composer update --no-interaction --prefer-source
- if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update --no-interaction --prefer-source --ignore-platform-reqs; fi
- if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update --no-interaction --prefer-source; fi

script:
- composer phpunit
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

All Notable changes to `league-uri-parser` will be documented in this file

## 1.1.0 - TBD
## 1.1.0 - 2017-09-25

### Added

Expand Down
2 changes: 1 addition & 1 deletion src/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @subpackage League\Uri
* @author Ignace Nyamagana Butera <[email protected]>
* @license https://github.com/thephpleague/uri-parser/blob/master/LICENSE (MIT License)
* @version 1.0.5
* @version 1.1.0
* @link https://github.com/thephpleague/uri-parser/
*
* For the full copyright and license information, please view the LICENSE
Expand Down
6 changes: 3 additions & 3 deletions src/Parser.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @subpackage League\Uri
* @author Ignace Nyamagana Butera <[email protected]>
* @license https://github.com/thephpleague/uri-parser/blob/master/LICENSE (MIT License)
* @version 1.0.5
* @version 1.1.0
* @link https://github.com/thephpleague/uri-parser/
*
* For the full copyright and license information, please view the LICENSE
Expand Down Expand Up @@ -174,8 +174,8 @@ protected function parseSchemeSpecificPart(string $uri): array
list($remaining_uri, $components['fragment']) = explode('#', $remaining_uri, 2) + [null, null];
list($remaining_uri, $components['query']) = explode('?', $remaining_uri, 2) + [null, null];
if (false !== ($pos = strpos($remaining_uri, '/'))) {
$components['path'] = substr($remaining_uri, $pos);
$remaining_uri = substr($remaining_uri, 0, $pos);
list($remaining_uri, $components['path']) = explode('/', $remaining_uri, 2) + [null, null];
$components['path'] = '/'.$components['path'];
}

//2 - The $remaining_uri represents the authority part
Expand Down
1 change: 1 addition & 0 deletions tests/ParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace LeagueTest\Uri;

use League\Uri;
use League\Uri\Exception;
use League\Uri\Parser;
use PHPUnit\Framework\TestCase;
Expand Down

0 comments on commit 4e01703

Please sign in to comment.