Skip to content

Commit 4e0fe33

Browse files
authored
Merge pull request #15 from derhasi/14-cs
Introduce Symfony 2 coding standards
2 parents e10d7ac + 6111a0e commit 4e0fe33

File tree

9 files changed

+644
-626
lines changed

9 files changed

+644
-626
lines changed

.editorconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
; top-most EditorConfig file
2+
root = true
3+
4+
; Unix-style newlines
5+
[*]
6+
end_of_line = LF
7+
8+
[*.php]
9+
indent_style = space
10+
indent_size = 4

.gitignore

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
# OS specific temporary files
2-
.DS_Store*
3-
ehthumbs.db
4-
Thumbs.db
5-
6-
# IDEs
7-
.buildpath
8-
.idea
9-
.project
10-
.settings
11-
*.esproj
12-
*.komodoproject
13-
*.komodotools
14-
nbproject
15-
16-
# Tools
17-
.svn
18-
.sass-cache
1+
# Ignore composer specific folders
2+
/vendor
3+
/composer.lock

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@ php:
44
- "5.4"
55
- "5.3"
66
install:
7-
- composer install
7+
- composer install
8+
script:
9+
- vendor/bin/phpunit
10+
- vendor/bin/phpcs

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424
"composer-plugin-api": "^1.0"
2525
},
2626
"require-dev": {
27-
"composer/composer": "1.0.*@dev",
28-
"phpunit/phpunit": "4.4.*",
29-
"derhasi/tempdirectory": "0.1.*"
27+
"composer/composer": "1.*",
28+
"phpunit/phpunit": "4.*",
29+
"derhasi/tempdirectory": "0.1.*",
30+
"squizlabs/php_codesniffer": "2.*",
31+
"escapestudios/symfony2-coding-standard": "2.*"
3032
},
3133
"autoload": {
3234
"psr-4": {

phpcs.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="derhasi-composer-preserve-paths">
3+
<description>The coding standard for derhasi-composer-preserve-paths.</description>
4+
<file>src</file>
5+
<file>tests</file>
6+
<arg name="warning-severity" value="0"/>
7+
<rule ref="vendor/escapestudios/symfony2-coding-standard/Symfony2"/>
8+
</ruleset>

0 commit comments

Comments
 (0)