Skip to content

Commit

Permalink
update immutability dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangut committed Sep 22, 2019
1 parent ea900e5 commit 8b4f5cc
Show file tree
Hide file tree
Showing 8 changed files with 52 additions and 46 deletions.
24 changes: 17 additions & 7 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
# language: php

build:
dependencies:
before:
- 'composer self-update'
- 'composer update --prefer-stable --prefer-source --no-interaction --no-progress --no-suggest'
cache:
directories:
- vendor/
nodes:
analysis:
project_setup:
override: true
tests:
override: [php-scrutinizer-run]

filter:
paths: [src/*]
excluded_paths: [tests/*, vendor/*]

before_commands:
- 'composer self-update'
- 'composer update --prefer-stable --prefer-source --no-interaction --no-scripts --no-progress --no-suggest'

coding_style:
php:
upper_lower_casing:
Expand All @@ -17,8 +28,8 @@ coding_style:
true_false_null: lower
spaces:
around_operators:
concatenation: true
negation: false
concatenation: true
negation: false
other:
after_type_cast: true

Expand All @@ -34,7 +45,6 @@ tools:
enabled: true
config:
ruleset: 'unusedcode,naming,design,controversial,codesize'

php_cpd: true
php_loc: true
php_pdepend: true
Expand Down
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ env:
- COMPOSER_FLAGS="--prefer-stable --prefer-dist"

php:
- 7.2
- 7.3
- 7.4snapshot
- nightly

matrix:
Expand All @@ -22,26 +24,25 @@ matrix:
- php: 7.1
env:
- COMPOSER_FLAGS="--prefer-lowest --prefer-stable --prefer-dist"
- php: 7.2
- php: 7.1
env:
- TEST_VERSION=true
- COMPOSER_FLAGS="--prefer-stable --prefer-dist"
allow_failures:
- php: nightly

before_install:
- if [[ -z $TEST_VERSION && -f "/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" ]]; then phpenv config-rm xdebug.ini; fi
- echo "extension = mongodb.so" >> /home/travis/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- composer global require hirak/prestissimo
- composer self-update --stable --no-progress
- if [[ -z $TEST_VERSION && -f "/home/travis/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini" ]]; then phpenv config-rm xdebug.ini; fi
- composer global require hirak/prestissimo
- composer self-update --stable --no-progress

install:
- travis_retry composer update $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress
- if [[ $TEST_VERSION ]]; then travis_retry composer require php-coveralls/php-coveralls $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress ; fi
- travis_retry composer update $COMPOSER_FLAGS --no-interaction --no-progress
- if [[ $TEST_VERSION ]]; then travis_retry composer require php-coveralls/php-coveralls $COMPOSER_FLAGS --no-interaction --no-scripts --no-progress ; fi

script:
- if [[ $TEST_VERSION ]]; then composer qa && composer report-phpunit-clover ; fi
- if [[ -z $TEST_VERSION ]]; then composer test-phpunit ; fi
- if [[ $TEST_VERSION ]]; then composer qa && composer report-phpunit-clover ; fi
- if [[ -z $TEST_VERSION ]]; then composer test-phpunit ; fi

after_script:
- if [[ $TEST_VERSION ]]; then travis_retry php vendor/bin/php-coveralls --verbose ; fi
- if [[ $TEST_VERSION ]]; then travis_retry php vendor/bin/php-coveralls --verbose ; fi
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"prefer-stable": true,
"require": {
"php": "^7.1",
"phpgears/identity": "~0.1"
"phpgears/identity": "~0.2"
},
"require-dev": {
"brainmaestro/composer-git-hooks": "^2.1",
Expand All @@ -32,16 +32,16 @@
"friendsofphp/php-cs-fixer": "^2.0",
"infection/infection": "^0.9",
"phpmd/phpmd": "^2.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-deprecation-rules": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"phpunit/phpunit": "^6.0|^7.0",
"phpstan/phpstan": "~0.11.12",
"phpstan/phpstan-deprecation-rules": "~0.11.2",
"phpstan/phpstan-strict-rules": "~0.11.1",
"phpunit/phpunit": "^7.0|^8.0",
"povils/phpmnd": "^2.0",
"roave/security-advisories": "dev-master",
"robinvdvleuten/ulid": "^3.0",
"sebastian/phpcpd": "^3.0|^4.0",
"squizlabs/php_codesniffer": "^2.0",
"thecodingmachine/phpstan-strict-rules": "^0.11",
"sebastian/phpcpd": "^4.0",
"squizlabs/php_codesniffer": "^3.0",
"thecodingmachine/phpstan-strict-rules": "^0.11.2",
"tuupola/ksuid": "^2.0"
},
"suggest": {
Expand Down
5 changes: 0 additions & 5 deletions phpstan.neon
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
includes:
- vendor/phpstan/phpstan-strict-rules/rules.neon
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
- vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

parameters:
level: max
paths:
Expand Down
8 changes: 4 additions & 4 deletions tests/IdentityExtra/KsuidIdentityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Gears\Identity\Extra\Tests;

use Gears\Identity\Exception\InvalidIdentityException;
use Gears\Identity\Extra\KsuidIdentity;
use PHPUnit\Framework\TestCase;

Expand All @@ -30,12 +31,11 @@ public function testFromString(): void
$this->assertSame($ksuid, (string) $stub);
}

/**
* @expectedException \Gears\Identity\Exception\InvalidIdentityException
* @expectedExceptionMessage Provided identity value "invalidKSUID" is not a valid KSUID
*/
public function testInvalidKsuid(): void
{
$this->expectException(InvalidIdentityException::class);
$this->expectExceptionMessage('Provided identity value "invalidKSUID" is not a valid KSUID');

KsuidIdentity::fromString('invalidKSUID');
}
}
8 changes: 4 additions & 4 deletions tests/IdentityExtra/ObjectIdIdentityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Gears\Identity\Extra\Tests;

use Gears\Identity\Exception\InvalidIdentityException;
use Gears\Identity\Extra\ObjectIdIdentity;
use PHPUnit\Framework\TestCase;

Expand All @@ -30,12 +31,11 @@ public function testFromString(): void
$this->assertSame($mongoId, (string) $stub);
}

/**
* @expectedException \Gears\Identity\Exception\InvalidIdentityException
* @expectedExceptionMessage Provided identity value "invalidMongoObjectId" is not a valid Mongo ObjectId
*/
public function testInvalidMongoId(): void
{
$this->expectException(InvalidIdentityException::class);
$this->expectExceptionMessage('Provided identity value "invalidMongoObjectId" is not a valid Mongo ObjectId');

ObjectIdIdentity::fromString('invalidMongoObjectId');
}
}
8 changes: 4 additions & 4 deletions tests/IdentityExtra/UlidIdentityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Gears\Identity\Extra\Tests;

use Gears\Identity\Exception\InvalidIdentityException;
use Gears\Identity\Extra\UlidIdentity;
use PHPUnit\Framework\TestCase;

Expand All @@ -30,12 +31,11 @@ public function testFromString(): void
$this->assertSame($ulid, (string) $stub);
}

/**
* @expectedException \Gears\Identity\Exception\InvalidIdentityException
* @expectedExceptionMessage Provided identity value "invalidULID" is not a valid ULID
*/
public function testInvalidUlid(): void
{
$this->expectException(InvalidIdentityException::class);
$this->expectExceptionMessage('Provided identity value "invalidULID" is not a valid ULID');

UlidIdentity::fromString('invalidULID');
}
}
8 changes: 4 additions & 4 deletions tests/IdentityExtra/XidIdentityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

namespace Gears\Identity\Extra\Tests;

use Gears\Identity\Exception\InvalidIdentityException;
use Gears\Identity\Extra\XidIdentity;
use PHPUnit\Framework\TestCase;

Expand All @@ -30,12 +31,11 @@ public function testFromString(): void
$this->assertSame($xid, (string) $stub);
}

/**
* @expectedException \Gears\Identity\Exception\InvalidIdentityException
* @expectedExceptionMessage Provided identity value "invalidXid" is not a valid Xid
*/
public function testInvalidXid(): void
{
$this->expectException(InvalidIdentityException::class);
$this->expectExceptionMessage('Provided identity value "invalidXid" is not a valid Xid');

XidIdentity::fromString('invalidXid');
}
}

0 comments on commit 8b4f5cc

Please sign in to comment.