Skip to content

Fix travis build for nightly and 7.1 versions #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2016
Merged

Fix travis build for nightly and 7.1 versions #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
958701e
Fix travis build for nightly and 7.1 versions
Sep 8, 2016
9fc500c
fix base64 tests
Sep 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ matrix:
env: SYMFONY_VERSION=3.0.*
- php: 7.0
env: SYMFONY_VERSION=3.0.*
- php: 7.0
- php: 7.1
env: SYMFONY_VERSION=3.1.*

allow_failures:
Expand All @@ -31,7 +31,7 @@ cache:
- $HOME/.composer/cache

before_install:
- if [[ "$TRAVIS_PHP_VERSION" != "5.6" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi
- if [[ "$TRAVIS_PHP_VERSION" != "5.6" && "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini || true; fi
- composer selfupdate
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

Expand Down
8 changes: 4 additions & 4 deletions Tests/Relay/Node/GlobalIdTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,28 +45,28 @@ public function testToGlobalIdWithTypeAndIdEmpty()

public function testFromGlobalId()
{
$params = GlobalId::fromGlobalId('VXNlcjoxNQ==');
$params = GlobalId::fromGlobalId(base64_encode('User:15'));

$this->assertEquals(['type' => 'User', 'id' => 15], $params);
}

public function testFromGlobalIdWithTypeEmpty()
{
$params = GlobalId::fromGlobalId('OjE1=');
$params = GlobalId::fromGlobalId(base64_encode(':15'));

$this->assertEquals(['type' => null, 'id' => 15], $params);
}

public function testFromGlobalIdWithIdEmpty()
{
$params = GlobalId::fromGlobalId('VXNlcjo=');
$params = GlobalId::fromGlobalId(base64_encode('User:'));

$this->assertEquals(['type' => 'User', 'id' => null], $params);
}

public function testFromGlobalIdWithTypeAndIdEmpty()
{
$params = GlobalId::fromGlobalId('Og==');
$params = GlobalId::fromGlobalId(base64_encode(':'));

$this->assertEquals(['type' => null, 'id' => null], $params);
}
Expand Down