Skip to content
This repository has been archived by the owner on Feb 4, 2023. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:stwe/DatatablesBundle into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
stephanvierkant committed Dec 6, 2018
2 parents c2fec67 + cfc8394 commit 7edc37e
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ cache:
matrix:
fast_finish: true
include:
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
env: DEPENDENCIES=beta
- php: hhvm
Expand All @@ -26,8 +23,7 @@ before_install:
- if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/framework-bundle=$SYMFONY_VERSION; fi
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [[ ${TRAVIS_PHP_VERSION:0:2} == "5." ]]; then composer require --dev "phpunit/phpunit=4.8.*"; fi
- if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." || ${TRAVIS_PHP_VERSION:0:2} == "hh" ]]; then composer require --dev "phpunit/phpunit=5.7.*"; fi
- composer require --dev "phpunit/phpunit=5.7.*"

install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# SgDatatablesBundle

[![SensioLabsInsight](https://insight.sensiolabs.com/projects/61803d08-17ab-4a69-ad13-6ec448762332/big.png)](https://insight.sensiolabs.com/projects/61803d08-17ab-4a69-ad13-6ec448762332)

[![knpbundles.com](http://knpbundles.com/stwe/DatatablesBundle/badge)](http://knpbundles.com/stwe/DatatablesBundle)

[![Build Status](https://travis-ci.org/stwe/DatatablesBundle.svg?branch=master)](https://travis-ci.org/stwe/DatatablesBundle)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"issues": "https://github.com/stwe/DatatablesBundle/issues"
},
"require": {
"php": ">=5.5.9",
"php": ">=7.1",
"symfony/framework-bundle": "^3.0|^4.0",
"doctrine/orm": "^2.5",
"symfony/options-resolver": "^3.0|^4.0",
Expand Down

0 comments on commit 7edc37e

Please sign in to comment.