diff --git a/.travis.yml b/.travis.yml index 9b0becf3a..5d1570ec8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: allow_failures: - php: "nightly" include: - - php: "7.1" + - php: "7.2" env: DOCS=yes - php: "7.1" env: REQUIRE="phpmyadmin/motranslator:^3.0" @@ -29,7 +29,7 @@ matrix: sudo: false install: - - if [ "$TRAVIS_PHP_VERSION" = "5.3" ] ; then sed -i '/apigen/D' composer.json ; fi + - if [ $(php -r "echo PHP_MAJOR_VERSION;") -lt 7 ] ; then sed -i '/sami/D' composer.json ; fi - if [ -n "$REQUIRE" ] ; then composer require "$REQUIRE" ; fi - composer install @@ -42,4 +42,4 @@ cache: script: - if [ "$DOCS" != "yes" ] ; then ./vendor/bin/phpunit --configuration phpunit.xml ; fi - - if [ "$DOCS" = "yes" ] ; then ./vendor/bin/apigen generate --destination doc --source src/ ; fi + - if [ "$DOCS" = "yes" ] ; then ./vendor/bin/sami.php --no-interaction update ./tools/sami-config.php ; fi diff --git a/composer.json b/composer.json index 7ef31f21b..d6e1c0970 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "apigen/apigen": "^4.1", + "sami/sami": "^4.0", "phpunit/php-code-coverage": "*", "phpunit/phpunit": "~4.8 || ~5.7 || ~6.5" }, diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php index 111eb042e..820947bfb 100644 --- a/src/Components/CaseExpression.php +++ b/src/Components/CaseExpression.php @@ -72,6 +72,7 @@ public function __construct() /** * @param Parser $parser the parser that serves as context * @param TokensList $list the list of tokens that are being parsed + * @param array $options parameters for parsing * * @return CaseExpression */ diff --git a/tools/sami-config.php b/tools/sami-config.php new file mode 100644 index 000000000..39db4ed60 --- /dev/null +++ b/tools/sami-config.php @@ -0,0 +1,22 @@ + +files() + ->name("*.php") + ->in("./src") +; + +return new Sami($iterator, array( + "title" => "A validating SQL lexer and parser with a focus on MySQL dialect.", + "build_dir" => "./doc/", + "cache_dir" => "./tmp" +)); +