From b00a8b09496f193c3289bf6f3c2ece4cd3a95967 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 20 Mar 2019 20:25:34 +0100 Subject: [PATCH] fix: osx CI Signed-off-by: William Desportes --- .npmignore | 1 + .travis.yml | 22 +++++--- composer.json | 2 +- composer.lock | 107 +++++++++++++++++++------------------- scripts/ci/install-osx.sh | 8 --- 5 files changed, 70 insertions(+), 70 deletions(-) delete mode 100755 scripts/ci/install-osx.sh diff --git a/.npmignore b/.npmignore index e61f6a8f..1d421f51 100644 --- a/.npmignore +++ b/.npmignore @@ -23,3 +23,4 @@ CODEOWNERS /.nyc_output /.editorconfig /.jshintrc +/.dependabot diff --git a/.travis.yml b/.travis.yml index f1823a07..1367c031 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ script: install: - if [ "$CI_TYPE" != "mocha" ]; then flags="--ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress"; fi - if [ "$CI_TYPE" != "mocha" ]; then composer install $flags; fi - - if [ "$CI_TYPE" = "mocha" ]; then npm install; fi + - if [ "$CI_TYPE" = "mocha" ]; then npm ci; fi after_script: - if [ "$CI_TYPE" != "cron" ]; then ./codacy-coverage.phar clover build/logs/clover.xml; else echo "skipped codacy"; fi stages: @@ -30,9 +30,9 @@ jobs: env: CI_TYPE=phpcs name: 'PHPCS - PHP 7.2' - stage: tests - php: '7.2' + php: '7.1' env: CI_TYPE=phpunit - name: 'PHPUNIT - PHP 7.2' + name: 'PHPUNIT - PHP 7.1' after_success: - bash <(curl -s https://codecov.io/bash) -cF php - stage: tests @@ -43,12 +43,20 @@ jobs: - bash <(curl -s https://codecov.io/bash) -cF php - stage: tests os: osx - language: generic - php: '7.2' + language: node_js + node_js: 10 env: CI_TYPE=phpunit - name: 'PHPUNIT - PHP 7.2' + name: 'PHPUNIT - PHP 7.1' + addons: + homebrew: + packages: + - php@7.1 + - composer before_install: - - './scripts/ci/install-osx.sh' + - mkdir ~/.homebrew_logs + - export HOMEBREW_LOGS="~/.homebrew_logs" + - export HOMEBREW_TEMP="/tmp" + - export HOMEBREW_INSTALL_BADGE="🌻" after_success: - bash <(curl -s https://codecov.io/bash) -cF php - stage: robot diff --git a/composer.json b/composer.json index 87dd7840..db576408 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^8.0", + "phpunit/phpunit": "^7.0 || ^8.0", "phpstan/phpstan": "^0.11.3", "slevomat/coding-standard": "^5.0", "squizlabs/php_codesniffer": "^3.3", diff --git a/composer.lock b/composer.lock index ed8a745a..ac2da162 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e17e40e43b4d8659e7908f4ec7940270", + "content-hash": "a544f7f19db35dfb91372a4c692048b7", "packages": [], "packages-dev": [ { @@ -1355,16 +1355,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.11.3", + "version": "0.11.4", "source": { "type": "git", "url": "/~https://github.com/phpstan/phpstan.git", - "reference": "e4644b4a8fd393c346f1137305fb2f76a7dc20a7" + "reference": "ccc4f854748664cc61d1f3d4ecb26810df1f0cd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4644b4a8fd393c346f1137305fb2f76a7dc20a7", - "reference": "e4644b4a8fd393c346f1137305fb2f76a7dc20a7", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ccc4f854748664cc61d1f3d4ecb26810df1f0cd4", + "reference": "ccc4f854748664cc61d1f3d4ecb26810df1f0cd4", "shasum": "" }, "require": { @@ -1424,44 +1424,44 @@ "MIT" ], "description": "PHPStan - PHP Static Analysis Tool", - "time": "2019-03-10T16:25:30+00:00" + "time": "2019-03-14T14:46:15+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.3", + "version": "6.1.4", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0317a769a81845c390e19684d9ba25d7f6aa4707", - "reference": "0317a769a81845c390e19684d9ba25d7f6aa4707", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.2", - "phpunit/php-file-iterator": "^2.0.2", + "php": "^7.1", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0.1", + "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.6.1" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1487,7 +1487,7 @@ "testing", "xunit" ], - "time": "2019-02-26T07:38:26+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1680,16 +1680,16 @@ }, { "name": "phpunit/phpunit", - "version": "8.0.4", + "version": "7.5.7", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/phpunit.git", - "reference": "a7af0201285445c9c73c4bdf869c486e36b41604" + "reference": "eb343b86753d26de07ecba7868fa983104361948" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7af0201285445c9c73c4bdf869c486e36b41604", - "reference": "a7af0201285445c9c73c4bdf869c486e36b41604", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/eb343b86753d26de07ecba7868fa983104361948", + "reference": "eb343b86753d26de07ecba7868fa983104361948", "shasum": "" }, "require": { @@ -1699,25 +1699,27 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "ext-xmlwriter": "*", "myclabs/deep-copy": "^1.7", "phar-io/manifest": "^1.0.2", "phar-io/version": "^2.0", - "php": "^7.2", + "php": "^7.1", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^7.0", + "phpunit/php-code-coverage": "^6.0.7", "phpunit/php-file-iterator": "^2.0.1", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.0", + "phpunit/php-timer": "^2.1", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^4.1", + "sebastian/environment": "^4.0", "sebastian/exporter": "^3.1", - "sebastian/global-state": "^3.0", + "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, "require-dev": { "ext-pdo": "*" }, @@ -1732,7 +1734,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.0-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1758,7 +1760,7 @@ "testing", "xunit" ], - "time": "2019-02-18T09:23:05+00:00" + "time": "2019-03-16T07:31:17+00:00" }, { "name": "psr/log", @@ -2094,26 +2096,23 @@ }, { "name": "sebastian/global-state", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "/~https://github.com/sebastianbergmann/global-state.git", - "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", - "reference": "edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": "^7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": "^7.0" }, "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -2121,7 +2120,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2144,7 +2143,7 @@ "keywords": [ "global state" ], - "time": "2019-02-01T05:30:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", @@ -2378,16 +2377,16 @@ }, { "name": "slevomat/coding-standard", - "version": "5.0.1", + "version": "5.0.3", "source": { "type": "git", "url": "/~https://github.com/slevomat/coding-standard.git", - "reference": "777ab1871859f5ab5fe3165ad0c2c855b02f5b7c" + "reference": "89877cc5751a35747eb0420bd7f55011f7ed9c21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/777ab1871859f5ab5fe3165ad0c2c855b02f5b7c", - "reference": "777ab1871859f5ab5fe3165ad0c2c855b02f5b7c", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/89877cc5751a35747eb0420bd7f55011f7ed9c21", + "reference": "89877cc5751a35747eb0420bd7f55011f7ed9c21", "shasum": "" }, "require": { @@ -2398,10 +2397,10 @@ "require-dev": { "jakub-onderka/php-parallel-lint": "1.0.0", "phing/phing": "2.16.1", - "phpstan/phpstan": "0.11.1", + "phpstan/phpstan": "0.11.4", "phpstan/phpstan-phpunit": "0.11", "phpstan/phpstan-strict-rules": "0.11", - "phpunit/phpunit": "8.0.0" + "phpunit/phpunit": "8.0.5" }, "type": "phpcodesniffer-standard", "autoload": { @@ -2414,20 +2413,20 @@ "MIT" ], "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.", - "time": "2019-02-26T21:17:00+00:00" + "time": "2019-03-19T21:14:54+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "/~https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "379deb987e26c7cd103a7b387aea178baec96e48" + "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48", - "reference": "379deb987e26c7cd103a7b387aea178baec96e48", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5b4333b4010625d29580eb4a41f1e53251be6baa", + "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa", "shasum": "" }, "require": { @@ -2460,12 +2459,12 @@ } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", + "homepage": "/~https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", "standards" ], - "time": "2018-12-19T23:57:18+00:00" + "time": "2019-03-19T03:22:27+00:00" }, { "name": "swaggest/json-diff", diff --git a/scripts/ci/install-osx.sh b/scripts/ci/install-osx.sh deleted file mode 100755 index 36f495d3..00000000 --- a/scripts/ci/install-osx.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -mkdir ~/.homebrew_logs -export HOMEBREW_LOGS="~/.homebrew_logs" -export HOMEBREW_TEMP="/tmp" -export HOMEBREW_INSTALL_BADGE="🌻" -brew update -brew install openldap libiconv php@7.2 composer -sed -i -e 's/^memory_limit = .*/memory_limit = -1/' /usr/local/etc/php/7.2/php.ini