diff --git a/.gitattributes b/.gitattributes index e93026cd69..6729d15f3a 100644 --- a/.gitattributes +++ b/.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 diff --git a/.travis.yml b/.travis.yml index 864c087d63..0576740d7c 100644 --- a/.travis.yml +++ b/.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" diff --git a/ChangeLog b/ChangeLog index 2b88feb3e7..13e6088b5d 100644 --- a/ChangeLog +++ b/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 diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 40ff676689..892c6e2887 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -10,7 +10,7 @@ . libraries/cache/routes.cache.php - test/sami-config.php + test/doctum-config.php */node_modules/* */tmp/* */twig-templates/* diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8c58b9b5f7..29af69ff95 100644 --- a/phpstan.neon.dist +++ b/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/* diff --git a/test/doctum-config.php b/test/doctum-config.php new file mode 100644 index 0000000000..7e93d8cc37 --- /dev/null +++ b/test/doctum-config.php @@ -0,0 +1,23 @@ +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), +]); diff --git a/test/sami-config.php b/test/sami-config.php deleted file mode 100644 index 539e2b418c..0000000000 --- a/test/sami-config.php +++ /dev/null @@ -1,21 +0,0 @@ -files() - ->name("*.php") - ->in("./libraries") -; - -return new Sami($iterator, [ - "title" => "MySQL web administration tool", - "build_dir" => "./build/apidocs/", - "cache_dir" => "./tmp" -]);