Skip to content

Commit

Permalink
DevKit updates (#305)
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Jan 23, 2019
1 parent ace2b32 commit 7fb438e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -7,7 +7,7 @@ charset = utf-8
insert_final_newline = true
trim_trailing_whitespace = true

[*.{yml,twig,php}]
[*.{yaml,yml,twig,php}]
indent_size = 4

[*.{js,json,scss,css}]
Expand Down
7 changes: 3 additions & 4 deletions .php_cs.dist
Expand Up @@ -43,10 +43,9 @@ $rules = [
'@PHP71Migration:risky' => true,
'compact_nullable_typehint' => true,
'void_return' => null,
// To be tested before insertion:
// 'strict_comparison' => true,
// 'strict_param' => true,
// 'php_unit_strict' => true,
'strict_comparison' => true,
'strict_param' => true,
'php_unit_strict' => true,
];


Expand Down
14 changes: 5 additions & 9 deletions .travis/before_install_test.sh
Expand Up @@ -5,16 +5,12 @@ PHP_INI_DIR="$HOME/.phpenv/versions/$(phpenv version-name)/etc/conf.d/"
TRAVIS_INI_FILE="$PHP_INI_DIR/travis.ini"
echo "memory_limit=3072M" >> "$TRAVIS_INI_FILE"

if [ "$TRAVIS_PHP_VERSION" '<' '7.0' ]; then
echo "extension=mongo.so" >> "$TRAVIS_INI_FILE"
else
echo "extension=mongodb.so" >> "$TRAVIS_INI_FILE"
echo "extension=mongodb.so" >> "$TRAVIS_INI_FILE"

# https://github.com/composer/composer/issues/5030
composer config "platform.ext-mongo" "1.6.16"
# Backwards compatibility with old mongo extension
composer require "alcaeus/mongo-php-adapter"
fi
# https://github.com/composer/composer/issues/5030
composer config "platform.ext-mongo" "1.6.16"
# Backwards compatibility with old mongo extension
composer require "alcaeus/mongo-php-adapter"

sed --in-place "s/\"dev-master\":/\"dev-${TRAVIS_COMMIT}\":/" composer.json

Expand Down
4 changes: 2 additions & 2 deletions .travis/before_script_test.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ev

if [ -f before_script_test.local.sh ]
if [ -f .travis/before_script_test.local.sh ]
then
./before_script_test.local.sh
./.travis/before_script_test.local.sh
fi
10 changes: 8 additions & 2 deletions Makefile
Expand Up @@ -51,8 +51,14 @@ cs-fix-xml:
done
.PHONY: cs-fix-xml

test:
phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
build:
mkdir $@

build/xdebug-filter.php: phpunit.xml.dist build
phpunit --dump-xdebug-filter $@

test: build/xdebug-filter.php
phpunit --prepend build/xdebug-filter.php -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
.PHONY: test

docs:
Expand Down

0 comments on commit 7fb438e

Please sign in to comment.