Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
juliangut committed Sep 22, 2019
1 parent 711cb19 commit d69e0b1
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 38 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
20 changes: 11 additions & 9 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,25 +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
- 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
19 changes: 10 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"prefer-stable": true,
"require": {
"php": "^7.1",
"phpgears/event": "~0.1.3",
"phpgears/identity": "~0.1.3"
"phpgears/event": "~0.2",
"phpgears/identity": "~0.2"
},
"require-dev": {
"brainmaestro/composer-git-hooks": "^2.1",
Expand All @@ -33,15 +33,16 @@
"infection/infection": "^0.9",
"pascaldevink/shortuuid": "^2.1",
"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/extension-installer": "^1.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",
"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"
},
"suggest": {
"hashids/hashids": "for hashed UUID based identities",
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
14 changes: 7 additions & 7 deletions tests/Aggregate/AbstractAggregateRootTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public function testApply(): void

$aggregateRoot = AbstractAggregateRootStub::instantiateWithEvent($aggregateIdentity, $event);

$this->assertSame($aggregateIdentity, $aggregateRoot->getIdentity());
static::assertSame($aggregateIdentity, $aggregateRoot->getIdentity());
}

public function testRecordedEvents(): void
Expand All @@ -46,17 +46,17 @@ public function testRecordedEvents(): void

$aggregateRoot = AbstractAggregateRootStub::instantiateWithEvent($aggregateIdentity, $event);

$this->assertCount(1, $aggregateRoot->getRecordedEvents());
static::assertCount(1, $aggregateRoot->getRecordedEvents());
$aggregateRoot->clearRecordedEvents();
$this->assertCount(0, $aggregateRoot->getRecordedEvents());
static::assertCount(0, $aggregateRoot->getRecordedEvents());

$aggregateRoot = AbstractAggregateRootStub::instantiateWithEvent($aggregateIdentity, $event);

$this->assertCount(1, $aggregateRoot->getRecordedEvents());
static::assertCount(1, $aggregateRoot->getRecordedEvents());
$recordedEvents = $aggregateRoot->collectRecordedEvents();
$this->assertCount(0, $aggregateRoot->collectRecordedEvents());
$this->assertCount(1, $recordedEvents);
static::assertCount(0, $aggregateRoot->collectRecordedEvents());
static::assertCount(1, $recordedEvents);

$this->assertEquals([$event], \iterator_to_array($recordedEvents));
static::assertEquals([$event], \iterator_to_array($recordedEvents));
}
}
2 changes: 1 addition & 1 deletion tests/Aggregate/AbstractEntityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ public function testCreation(): void
$entity = new class($identity) extends AbstractEntity {
};

$this->assertSame($identity, $entity->getIdentity());
static::assertSame($identity, $entity->getIdentity());
}
}

0 comments on commit d69e0b1

Please sign in to comment.