Skip to content
This repository has been archived by the owner on Dec 27, 2018. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/Narno/PHPoole-library
Browse files Browse the repository at this point in the history
  • Loading branch information
ArnaudLigny committed Nov 27, 2017
2 parents 9b162f5 + 6761918 commit 53c8a63
Show file tree
Hide file tree
Showing 8 changed files with 427 additions and 214 deletions.
25 changes: 25 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 2
jobs:
build:
docker:
- image: circleci/php:7-apache-node-browsers
steps:
- checkout
- run:
name: Switch timezone to Paris
command: sudo cp /usr/share/zoneinfo/Europe/Paris /etc/localtime
- run:
name: Composer
command: |
sudo composer self-update
composer install --no-interaction
- run:
name: PHPUnit
command: |
mkdir -p ~/phpunit
vendor/bin/phpunit --log-junit ~/phpunit/junit.xml
when: always
- store_test_results:
path: ~/phpunit
- store_artifacts:
path: ~/phpunit
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
language: php
# PHP versions
php:
- 5.5
- 5.6
- 7.0
- 7.1
# faster builds on new travis setup not using sudo
sudo: false
# cache vendor dirs
Expand All @@ -16,16 +15,17 @@ install:
- composer self-update
# install package
before_script:
- phpenv config-rm xdebug.ini
#- phpenv config-rm xdebug.ini
- composer install --no-interaction
- mkdir -p build/logs
# run PHPUnit and export code coverage log
script:
- phpunit -c ./ --coverage-text --coverage-clover build/logs/clover.xml
# run coveralls
after_script:
- php vendor/bin/coveralls -v
# deploy docs
# docs & co
after_success:
# run coveralls
- travis_retry php vendor/bin/coveralls -v
# build API docs
#- vendor/bin/sami.php update sami.php
# deploy docs
- bash deploy-docs.sh
16 changes: 0 additions & 16 deletions circle.yml

This file was deleted.

20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
}
],
"require": {
"php": "^5.5|^7.0",
"cocur/slugify": "v3.0.1",
"php": "^5.6|^7.1",
"cocur/slugify": "3.0.1",
"dflydev/dot-access-data": "1.1.0",
"erusev/parsedown-extra": "0.7.1",
"matthiasmullie/minify": "1.3.55",
"matthiasmullie/minify": "1.3.56",
"myclabs/php-enum": "1.5.2",
"symfony/filesystem": "v2.8.29",
"symfony/finder": "2.7.36|2.8.29",
"symfony/process": "v2.8.29",
"symfony/yaml": "v2.8.29",
"twig/twig": "v1.35.0"
"symfony/filesystem": "2.8.31|3.3.13",
"symfony/finder": "2.7.38|2.8.31|3.3.13",
"symfony/process": "2.8.31|3.3.13",
"symfony/yaml": "2.8.31|3.3.13",
"twig/twig": "1.35.0"
},
"require-dev": {
"phpunit/phpunit": "4.8.36",
"phpunit/phpunit": "5.7.25",
"sami/sami": "3.3.0",
"satooshi/php-coveralls": "v1.0.2"
"php-coveralls/php-coveralls": "1.0.2"
},
"autoload": {
"psr-4" : {
Expand Down
Loading

0 comments on commit 53c8a63

Please sign in to comment.