Skip to content

Commit

Permalink
Merge pull request EC-CUBE#128 from nobuhiko/ec-cube-extended
Browse files Browse the repository at this point in the history
PHP7対応
  • Loading branch information
ryo-endo authored Aug 30, 2017
2 parents d054074 + 68b6815 commit 1d85140
Show file tree
Hide file tree
Showing 213 changed files with 9,171 additions and 39,928 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ composer.phar
/reports/*
.idea
vagrant
!.gitkeep
.vagrant/
Vagrantfile
26 changes: 21 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
language: php
sudo: required
php:
- 5.3.3
- 5.3
#- 5.3.3
#- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1

matrix:
fast_finish: true

env:
- DB=mysql USER=root DBNAME=myapp_test DBPASS=' ' DBUSER=root
- DB=pgsql USER=postgres DBNAME=myapp_test DBPASS=password DBUSER=postgres
global:
- DBNAME=myapp_test HTTP_URL=http://localhost:8085/ HTTPS_URL=https://localhost:8085/
matrix:
- DB=mysql USER=root DBPASS=' ' DBUSER=root
- DB=pgsql USER=postgres DBPASS=password DBUSER=postgres

before_script:
- composer self-update || true
Expand All @@ -24,10 +29,21 @@ before_script:
- sh -c "if [ '$DB' = 'pgsql' ]; then sh ./eccube_install.sh pgsql; fi"
- cp tests/require.php.jenkins tests/require.php
- cat ./data/config/config.php
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- php -S localhost:8085 -t html/ &
- php vendor/bin/codecept build

script:
- mkdir -p reports/coverage
- phpunit -c phpunit.xml.dist
- php vendor/bin/phpunit -c phpunit.xml.dist
- php vendor/bin/codecept run --env travis --steps

after_script:
- php vendor/bin/coveralls -v

# Cache folder, you can delete cache from Travis CI web interface
cache:
directories:
- vendor
- $HOME/.composer/cache vendor/
17 changes: 17 additions & 0 deletions codeception.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
actor: Tester
paths:
tests: ctests
log: ctests/_output
data: ctests/_data
helpers: ctests/_support
settings:
bootstrap: _bootstrap.php
colors: true
memory_limit: 1024M
modules:
config:
Db:
dsn: ''
user: ''
password: ''
dump: ctests/_data/dump.sql
53 changes: 51 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,59 @@
{
"name": "ec-cube/eccube-2_13",
"description": "EC-CUBE 2.13-stable",
"type": "project",
"homepage": "http://www.ec-cube.net/",
"license": [
"GPL-2.0",
"Commercial"
],
"support": {
"issues": "https://github.com/EC-CUBE/eccube-2_13/issues"
},
"config": {
"disable-tls": true,
"secure-http": false
"secure-http": false,
"platform": {
"php": "5.4"
}
},
"repositories": [
{
"type": "pear",
"url": "http://pear.php.net/"
}
],
"require-dev": {
"satooshi/php-coveralls": "1.0",
"phpunit/phpunit": "3.7.*"
"codeception/codeception": "*"
},
"require": {
"smarty/smarty": "*",
"pear-pear.php.net/PEAR" : "*",
"pear-pear.php.net/Archive_Tar" : "*",
"pear-pear.php.net/Mail" : "*",
"pear-pear.php.net/Calendar" : "*",
"pear-pear.php.net/Cache_Lite" : "*",
"pear-pear.php.net/File_SearchReplace" : "*",
"pear-pear.php.net/HTTP_Request" : "*",
"pear-pear.php.net/MDB2_Driver_mysqli" : "1.5.0b4",
"pear-pear.php.net/MDB2_Driver_pgsql" : "1.5.0b4",
"pear-pear.php.net/MDB2" : "2.5.0-beta5 as 2.5.0",
"pear-pear.php.net/Net_SMTP" : "*",
"pear-pear.php.net/Net_Socket" : "*",
"pear-pear.php.net/Net_URL" : "*",
"pear-pear.php.net/Net_UserAgent_Mobile" : "*",
"pear-pear.php.net/SOAP" : "*",
"pear-pear.php.net/Services_JSON" : "*",
"pear-pear.php.net/Text_Password" : "*",
"pear-pear.php.net/XML_Parser" : "*",
"pear-pear.php.net/XML_Serializer" : "*",
"pear-pear.php.net/XML_Util" : "*"
},
"autoload": {
"classmap": [
"data/class",
"data/class_extends"
]
}
}
Loading

0 comments on commit 1d85140

Please sign in to comment.