From d793aaaea42dbaaea43e0a06431c860272ca5b9f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Apr 2018 12:53:15 +0200 Subject: update to 9.2.3 add dependency on sebastian/diff 1.4 --- composer.json | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 99afa58..a0c67f4 100644 --- a/composer.json +++ b/composer.json @@ -24,22 +24,24 @@ "phpmailer/phpmailer": "~5.2", "sabre/vobject": "~4.1", "simplepie/simplepie": "^1.5", - "tecnickcom/tcpdf": "~6.2", + "tecnickcom/tcpdf": "~6.2.16", "zendframework/zend-cache": "^2.7", "zendframework/zend-i18n": "^2.7", "zendframework/zend-serializer": "^2.7", "michelf/php-markdown": "^1.6", "true/punycode": "^2.1", - "paragonie/random_compat": "^2.0" + "paragonie/random_compat": "^2.0", + "sebastian/diff": "^1.4" }, "require-dev": { "guzzlehttp/guzzle": "~6", - "glpi-project/coding-standard": "0.6", + "glpi-project/coding-standard": "^0.7.0", "consolidation/robo": "^1.0", "natxet/CssMin": "^3.0", "patchwork/jsqueeze": "^2.0", - "atoum/atoum": "^3.2", - "atoum/telemetry-extension": "^1.0" + "atoum/atoum": "^3.3", + "atoum/telemetry-extension": "^1.0", + "fzaninotto/Faker": "^1.7" }, "suggest": { "ext-ldap": "Used ot provide LDAP authentication and synchronization", @@ -52,13 +54,16 @@ } }, "scripts": { - "testdb": "vendor/bin/atoum --debug --force-terminal --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/database", - "test": "vendor/bin/atoum --debug --force-terminal --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/units", - "testweb": "vendor/bin/atoum --debug --force-terminal --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/web", - "testldap": "vendor/bin/atoum --debug --force-terminal --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/LDAP", - "cs": "vendor/bin/phpcs -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config ./", + "testdb": "php -d memory_limit=512M vendor/bin/atoum --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/database", + "testfunc": "php -d memory_limit=512M vendor/bin/atoum --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/functionnal/", + "testunits": "php -d memory_limit=512M vendor/bin/atoum --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage -d tests/units", + "testweb": "php -d memory_limit=512M vendor/bin/atoum --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/web", + "testldap": "php -d memory_limit=512M vendor/bin/atoum --debug --force-terminal --use-dot-report --configurations tests/telemetry.php --bootstrap-file tests/bootstrap.php --no-code-coverage --max-children-number 1 -d tests/LDAP", + "csp": "vendor/bin/phpcs --parallel=500 -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config,/.git ./", + "cs": "vendor/bin/phpcs -d memory_limit=512M -p --standard=vendor/glpi-project/coding-standard/GlpiStandard/ --ignore=/vendor/,/plugins/,/files/,/lib/,/config/,/tests/config,/css/tiny_mce,/.git ./", "post-install-cmd": [ - "@php -r \"file_put_contents('.composer.hash', sha1_file('composer.lock'));\"" + "@php -r \"file_put_contents('.composer.hash', sha1_file('composer.lock'));\"", + "patch -d vendor/zendframework/zend-cache/ -p1 < tools/zend-cache-php7.2.patch" ], "post-update-cmd": "@php -r \"file_put_contents('.composer.hash', sha1_file('composer.lock'));\"" } -- cgit