Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HTTP/Request の修正 #166

Merged
merged 6 commits into from
Sep 21, 2017
Merged

HTTP/Request の修正 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
74e7834
vendorのインストール先の変更
nobuhiko Sep 15, 2017
9b04a64
Merge branch 'unit_test_check' into 147
nobuhiko Sep 15, 2017
55fca11
PEAR5の削除
nobuhiko Sep 15, 2017
4facda9
HTTP_Requestのtestの追加
nobuhiko Sep 15, 2017
cc23766
composer.jsonから不要な記述を削除
nobuhiko Sep 15, 2017
384ac2c
fixed #145 HTTP/Request の修正
nobuhiko Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
!.gitmodule
composer.phar
/vendor/
/data/vendor/
*.cache
*.log
/data/config/config.php
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- php -S localhost:8085 -t html/ &
- php vendor/bin/codecept build
- php data/vendor/bin/codecept build

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

after_script:
- php vendor/bin/coveralls -v
- php data/vendor/bin/coveralls -v
- cat ./data/logs/error.log

# Cache folder, you can delete cache from Travis CI web interface
cache:
directories:
- vendor
- data/vendor
- $HOME/.composer/cache vendor/
7 changes: 1 addition & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"config": {
"disable-tls": true,
"secure-http": false,
"vendor-dir": "data/vendor",
"platform": {
"php": "5.4"
}
Expand All @@ -32,18 +33,12 @@
"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" : "*",
Expand Down
Loading