Skip to content

Commit

Permalink
Apply new standard normalization
Browse files Browse the repository at this point in the history
  • Loading branch information
Riimu committed Aug 22, 2015
1 parent 050e7fa commit 44c664a
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 12 deletions.
4 changes: 0 additions & 4 deletions .coveralls.yml

This file was deleted.

8 changes: 6 additions & 2 deletions .gitattributes
@@ -1,7 +1,11 @@
# Make sure line endings are normalized to LF for Windows
* text eol=lf

# Remove developer files from exports
tests export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.php_cs export-ignore
.travis.yml export-ignore
.coveralls.yml export-ignore
apigen.neon export-ignore
phpunit.xml export-ignore
tests export-ignore
31 changes: 31 additions & 0 deletions .php_cs
@@ -0,0 +1,31 @@
<?php

$finder = Symfony\CS\Finder\DefaultFinder::create()
->in(__DIR__ . '/src')
->in(__DIR__ . '/tests');

return Symfony\CS\Config\Config::create()
->fixers([
'align_double_arrow',
'concat_with_spaces',
'ereg_to_preg',
'multiline_spaces_before_semicolon',
'newline_after_open_tag',
'ordered_use',
'php4_constructor',
'php_unit_construct',
'php_unit_strict',
'short_array_syntax',
'strict',
'strict_param',

'-concat_without_spaces',
'-linefeed',
'-phpdoc_no_empty_return',
'-phpdoc_params',
'-phpdoc_separation',
'-pre_increment',
'-unalign_double_arrow',
'-unary_operators_spaces',
])
->finder($finder);
21 changes: 16 additions & 5 deletions .travis.yml
@@ -1,16 +1,27 @@
language: php
sudo: false

php:
- 5.6
- 5.5
- 5.4

before_script:
- composer require "satooshi/php-coveralls dev-master"
cache:
directories:
- vendor

before_install:
- composer self-update

install:
- composer require --no-update --no-interaction "phpunit/phpunit:4.*" "squizlabs/php_codesniffer:2.*" "fabpot/php-cs-fixer:1.*"
- travis_retry composer install --no-interaction
- travis_retry wget https://scrutinizer-ci.com/ocular.phar

script:
- mkdir -p build/logs
- phpunit --coverage-clover build/logs/clover.xml
- vendor/bin/phpunit --coverage-clover=coverage.clover
- vendor/bin/phpcs --standard=PSR2 src tests
- vendor/bin/php-cs-fixer fix --dry-run --diff

after_script:
- php vendor/bin/coveralls -v
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
3 changes: 2 additions & 1 deletion apigen.neon
Expand Up @@ -7,5 +7,6 @@ charset:

main: Riimu\Kit\ClassLoader
title: ClassLoader
php: false
php: true
tree: true
templateTheme: bootstrap

0 comments on commit 44c664a

Please sign in to comment.