Skip to content

1.0.2 #17

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.

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

Merged
merged 6 commits into from
Dec 8, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# Travis CI (MIT License) configuration file
# @link https://travis-ci.org/
# Travis CI

# Use new container based environment
sudo: false

# Declare project language.
# @link http://about.travis-ci.org/docs/user/languages/php/
language: php

env:
Expand Down Expand Up @@ -40,16 +38,18 @@ matrix:
# - php: 'nightly'

before_install:
# Remove xdebug.
# Remove xdebug. Needed for coverage.
# - phpenv config-rm xdebug.ini
# Update composer to latest version
# - composer self-update

install:
# Update composer to latest version.
- composer self-update
# Install project composer deps in composer.json
- composer install
# Install composer deps in composer.json.
# - composer require squizlabs/php_codesniffer:dev-master
# - composer require satooshi/php-coveralls:dev-master
- phpenv rehash
- composer install --no-interaction

before_script:
# Rehash the php environment if testing on several PHP versions.
# - phpenv rehash

script:
# Check for PHP syntax errors.
Expand All @@ -64,4 +64,4 @@ script:
- ./vendor/bin/phpunit --debug --filter $STANDARD

after_success:
- if [[ "$COVERALLS" == "1" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/clover.xml; fi
- if [[ "$COVERALLS" == "1" ]]; then ./vendor/bin/coveralls -v -x ./build/logs/coverage/clover/clover.xml; fi
10 changes: 5 additions & 5 deletions GreynoiseLaravel/ruleset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
<exclude-pattern>*/*.js</exclude-pattern>
<exclude-pattern>*/*.xml</exclude-pattern>
<exclude-pattern>*/autoload.php</exclude-pattern>
<exclude-pattern>*/app/Middleware/*</exclude-pattern>
<exclude-pattern>*/app/Console/Kernel.php</exclude-pattern>
<exclude-pattern>*/app/Exceptions/Handler.php</exclude-pattern>
<exclude-pattern>*/app/Http/Kernel.php</exclude-pattern>
<exclude-pattern>*/app/Providers/*</exclude-pattern>
<exclude-pattern>*/Middleware/*</exclude-pattern>
<exclude-pattern>*/Console/Kernel.php</exclude-pattern>
<exclude-pattern>*/Exceptions/Handler.php</exclude-pattern>
<exclude-pattern>*/Http/Kernel.php</exclude-pattern>
<exclude-pattern>*/Providers/*</exclude-pattern>
<!-- Include the whole PSR-2 standard -->
<rule ref="PSR2"/>
<!--
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Greynoise Design - Laravel 5 Standard

Version 1.0.1
Version 1.0.2

| Master | Develop |
| :---: | :---: |
Expand Down Expand Up @@ -130,7 +130,12 @@ Set it to your preference.
"*/*.css",
"*/*.js",
"*/*.xml",
"*/autoload.php"
"*/autoload.php",
"*/Middleware/*",
"*/Console/Kernel.php",
"*/Exceptions/Handler.php",
"*/Http/Kernel.php",
"*/Providers/*"
],
}
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "greynoise-design/laravel-coding-standard",
"description": "Laravel 5 Coding Standard for PHP_CodeSniffer 3.",
"version":"1.0.1",
"version":"1.0.2",
"license":"MIT",
"authors": [
{
Expand Down
3 changes: 2 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
</testsuite>
</testsuites>
<logging>
<log type="coverage-clover" target="./build/logs/clover.xml"/>
<log type="coverage-clover" target="./build/logs/coverage/clover/clover.xml"/>
<log type="coverage-html" target="./build/logs/coverage/html/"/>
</logging>
<filter>
<whitelist>
Expand Down