Skip to content

Commit

Permalink
Merge pull request #14357 from williamdes/issue-14345-apigen
Browse files Browse the repository at this point in the history
Replace apigen with Sami in CI
  • Loading branch information
MauricioFauth committed Jun 4, 2018
2 parents 2a34c01 + ffc40cc commit 199f6a8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 10 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Expand Up @@ -20,7 +20,6 @@ sudo: required
env:
matrix:
- CI_MODE=test
- CI_MODE=apidocs
global:
- TESTSUITE_USER=root
- TESTSUITE_URL=http://127.0.0.1:8000
Expand Down Expand Up @@ -65,6 +64,8 @@ matrix:
env: CI_MODE=release
- php: "7.1"
env: CI_MODE=docs
- php: "7.1"
env: CI_MODE=apidocs
- os: osx
language: generic
env: CI_MODE=test
Expand All @@ -76,14 +77,7 @@ matrix:
- curl https://getcomposer.org/installer | php
- ln -s "`pwd`/composer.phar" /usr/local/bin/composer
- mysql.server start
exclude:
- php: "7.2"
env: CI_MODE=apidocs
- php: "nightly"
env: CI_MODE=apidocs
allow_failures:
- php: "7.1"
env: CI_MODE=apidocs
- php: "nightly"
env: CI_MODE=test

Expand Down
2 changes: 1 addition & 1 deletion test/ci-apidocs
@@ -1,3 +1,3 @@
#!/bin/sh
set -e
./vendor/bin/apigen generate --destination apidoc --source libraries/
./vendor/bin/sami.php --no-interaction update ./test/sami-config.php
2 changes: 1 addition & 1 deletion test/ci-install-apidocs
@@ -1,3 +1,3 @@
#!/bin/sh
set -e
composer require "apigen/apigen:^4.1"
composer require "sami/sami:^4.0"
22 changes: 22 additions & 0 deletions test/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("./libraries")
;

return new Sami($iterator, array(
"title" => "MySQL web administration tool",
"build_dir" => "./build/apidocs/",
"cache_dir" => "./tmp"
));

0 comments on commit 199f6a8

Please sign in to comment.