Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>

.gitattributes

@@ -17,4 +17,5 @@ psalm.xml export-ignore
 psalm-baseline.xml export-ignore
 DCO export-ignore
 .editorconfig export-ignore
+test/doctum-config.php export-ignore
 .browserslistrc export-ignore

.travis.yml

@@ -176,8 +176,8 @@ jobs:
       before_script: skip
       after_script: skip
       after_success: skip
-      install: composer global require "sami/sami:^4.0"
-      script: $HOME/.composer/vendor/bin/sami.php --no-interaction update ./test/sami-config.php
+      install: composer global require "code-lts/doctum:^5.0"
+      script: $HOME/.composer/vendor/bin/doctum.php --no-interaction update ./test/doctum-config.php
 
     - stage: "Other tests"
       name: "Build release"

ChangeLog

@@ -95,6 +95,7 @@ phpMyAdmin - ChangeLog
 - issue #15367 Fix first replica links, start, stop, ignore links
 - issue #16058 Add "PMA_single_signon_HMAC_secret" for signon auths to make special links work and udate examples
 - issue #16269 Support ReCaptcha v2 checkbox width "$cfg['CaptchaMethod'] = 'checkbox';"
+- issue #14644 Use Doctum instead of Sami
 
 5.0.2 (2020-03-20)
 - issue        Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page

phpcs.xml.dist

@@ -10,7 +10,7 @@
     <file>.</file>
 
     <exclude-pattern>libraries/cache/routes.cache.php</exclude-pattern>
-    <exclude-pattern>test/sami-config.php</exclude-pattern>
+    <exclude-pattern>test/doctum-config.php</exclude-pattern>
     <exclude-pattern>*/node_modules/*</exclude-pattern>
     <exclude-pattern>*/tmp/*</exclude-pattern>
     <exclude-pattern>*/twig-templates/*</exclude-pattern>

phpstan.neon.dist

@@ -17,7 +17,7 @@ parameters:
         - examples/openid.php
         - node_modules/*
         - libraries/cache/*
-        - test/sami-config.php
+        - test/doctum-config.php
         - tmp/*
         - twig-templates/*
         - vendor/*

test/doctum-config.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * This file has been generated by phpmyadmin/scripts/develdocs/build.sh
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/doctum.php
+ * @see https://github.com/phpmyadmin/scripts/blob/master/develdocs/build.sh
+ */
+use Doctum\Doctum;
+use Symfony\Component\Finder\Finder;
+use Doctum\RemoteRepository\GitHubRemoteRepository;
+
+$root = realpath(__DIR__ . '/../') . '/';
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->in($root . 'libraries');
+
+return new Doctum($iterator, [
+    'title'                => json_decode(file_get_contents($root . 'composer.json'))->description,
+    'build_dir'            => $root . 'build/apidocs/',
+    'cache_dir'            => $root . 'tmp/',
+    'remote_repository'    => new GitHubRemoteRepository('phpmyadmin/phpmyadmin', $root),
+]);

test/sami-config.php

@@ -1,21 +0,0 @@
-<?php
-/**
- * @package PhpMyAdmin-test
- * 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("./libraries")
-;
-
-return new Sami($iterator, [
-    "title"                => "MySQL web administration tool",
-    "build_dir"            => "./build/apidocs/",
-    "cache_dir"            => "./tmp"
-]);