Skip to content

Commit

Permalink
Merge pull request #130 from nthachus/master-l4
Browse files Browse the repository at this point in the history
Bulk update to release v1.1.0 for Laravel4
  • Loading branch information
mewebstudio authored Feb 28, 2018
2 parents a638051 + 7f8c241 commit 0aee6d6
Show file tree
Hide file tree
Showing 33 changed files with 576 additions and 251 deletions.
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
*~
*.bak
.DS_Store
Thumbs.db
desktop.ini
vendor
/vendor
*.phar
phpunit.xml
composer.lock
.idea/
32 changes: 23 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
language: "php"
language: php

php:
- "5.3"
- "5.4"
- "5.5"
- 5.4
- 5.5.33
- 5.6
- hhvm

matrix:
include:
- php: 5.3.3
dist: precise
allow_failures:
- php: hhvm
fast_finish: true

cache:
directories:
- vendor
- $HOME/.composer/cache

before_script:
- echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
- "curl -s http://getcomposer.org/installer | php && php composer.phar install --prefer-source --no-interaction --dev"
- "pyrus install pear/PHP_CodeSniffer && phpenv rehash"
- if [[ $TRAVIS_PHP_VERSION = 5.3.3 ]]; then composer config -g -- disable-tls true; composer config -g -- secure-http false; fi;
- travis_retry composer self-update
- travis_retry composer install --no-interaction --no-progress

script:
- "phpunit -c test"
- "phpcs --encoding=utf-8 --extensions=php --standard=test/phpcs.xml -nsp ./"
- vendor/bin/phpunit
- vendor/bin/phpcs --encoding=utf-8 --extensions=php --standard=tests/phpcs.xml
11 changes: 9 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,15 @@
],
"require": {
"php": ">=5.3.0",
"illuminate/support": "~4"

"illuminate/support": "~4",
"illuminate/hashing": "~4",
"illuminate/session": "~4",
"illuminate/validation": "~4",
"illuminate/routing": "~4"
},
"require-dev": {
"squizlabs/php_codesniffer": "*",
"phpunit/phpunit": "~4.0"
},
"autoload": {
"psr-4": {
Expand Down
77 changes: 0 additions & 77 deletions composer.lock

This file was deleted.

31 changes: 31 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
>

<filter>
<blacklist>
<directory>./vendor/</directory>
<directory>./tests/</directory>
</blacklist>
</filter>

<testsuites>
<testsuite>
<directory suffix="Test.php">./tests/</directory>
</testsuite>
</testsuites>

<logging>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
</logging>

</phpunit>
Empty file removed public/.gitkeep
Empty file.
Binary file modified public/assets/backgrounds/01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/backgrounds/15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0aee6d6

Please sign in to comment.