From b1ca941675c17e05e8a1b65af5ddec4b86c75c58 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 5 Jun 2018 23:07:26 +0200
Subject: [PATCH 1/2] Replace apigen with Sami in CI

- Removed apigen/apigen
- Added sami/sami
- Generated a configuration and added it in /tools/ as config-sami.php
- Modified .travis.yml

Closes: #194
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 .travis.yml           |  6 +++---
 composer.json         |  2 +-
 tools/sami-config.php | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 tools/sami-config.php

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/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 @@
+
+<?php
+/**
+ * This file has been generated by phpmyadmin/scripts:/develdocs/build.sh
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/sami.php
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/build.sh
+ */
+use Sami\Sami;
+use Symfony\Component\Finder\Finder;
+
+$iterator = Finder::create()
+    ->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"
+));
+

From 981c49945a96d53513af61e27effbf5eb5bb35c0 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Wed, 6 Jun 2018 00:03:37 +0200
Subject: [PATCH 2/2] PHPDOC fix

- Added phpdoc for $options as requested by Sami

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 src/Components/CaseExpression.php | 1 +
 1 file changed, 1 insertion(+)

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
      */