Skip to content

Commit

Permalink
Merge pull request #750 from michaelcullum/composer-updates
Browse files Browse the repository at this point in the history
Composer updates & PHP 7 Compat
  • Loading branch information
iansltx authored Feb 4, 2019
2 parents 1b93d5b + 30979fa commit d311b8c
Show file tree
Hide file tree
Showing 3,858 changed files with 2,752 additions and 545,368 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ web/js/site.js
vendor/.git
node_modules/
.DS_Store
web/inc
web/inc
vendor/
7 changes: 1 addition & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,8 @@ matrix:
include:
- php: 5.6
- php: 7.3
allow_failures:
- php: 7.3
fast_finish: true
before_script:
- composer global require squizlabs/php_codesniffer
- composer global require phpunit/phpunit
- composer global require jakub-onderka/php-parallel-lint
- composer install
script:
- PATH=$HOME/.composer/vendor/bin:$PATH ./build.sh
- ./build.sh
9 changes: 5 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
#!/bin/bash
set -e

parallel-lint --exclude vendor .
vendor/bin/parallel-lint --exclude vendor .

phpcs \
vendor/bin/phpcs \
--standard=psr2 \
--ignore=vendor \
--extensions=php \
--runtime-set ignore_warnings_on_exit true \
-p \
.

cd tests
phpunit
php vendor/bin/security-checker security:check composer.lock

vendor/bin/phpunit -c tests/phpunit.xml
15 changes: 11 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,19 @@
"slim/slim": "~2.4",
"slim/views": "~0.1",
"twig/twig": "~1.15",
"symfony/form": "~2.5",
"symfony/validator": "~2.5",
"symfony/security-csrf": "~2.5",
"symfony/twig-bridge": "~2.5",
"symfony/form": "~2.8",
"symfony/validator": "~2.8",
"symfony/security-csrf": "~2.8",
"symfony/twig-bridge": "~2.8",
"org_heigl/daterange": "~1.1",
"guzzlehttp/guzzle": "^6.2.1",
"monolog/monolog": "^1.21"
},
"require-dev": {
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.4",
"jakub-onderka/php-parallel-lint": "^1.0",
"roave/security-advisories": "dev-master",
"sensiolabs/security-checker": "^5.0"
}
}
Loading

0 comments on commit d311b8c

Please sign in to comment.