Skip to content

Commit b153f16

Browse files
Merge pull request #16 from LinioIT/feature/symfony-3.2
Add Symfony 3.0 support and require PHP 7.1
2 parents 611d052 + b70d0a8 commit b153f16

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+61
-63
lines changed

.php_cs

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
<?php
22

3-
$finder = Symfony\CS\Finder\DefaultFinder::create()
4-
->in(__DIR__ . '/Exception')
5-
->in(__DIR__ . '/Form')
6-
->in(__DIR__ . '/Tests')
7-
->name('*.php')
8-
;
3+
$finder = PhpCsFixer\Finder::create()
4+
->in(__DIR__ . '/src')
5+
->in(__DIR__ . '/tests');
96

10-
return Symfony\CS\Config\Config::create()
11-
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
12-
->fixers(['concat_with_spaces', 'short_array_syntax', 'ordered_use', '-pre_increment'])
13-
->finder($finder)
7+
return PhpCsFixer\Config::create()
8+
->setRules([
9+
'@Symfony' => true,
10+
'concat_space' => ['spacing' => 'one'],
11+
'array_syntax' => ['syntax' => 'short'],
12+
'ordered_imports' => true,
13+
'pre_increment' => false,
14+
'phpdoc_order' => true,
15+
'blank_line_after_opening_tag' => true,
16+
'phpdoc_align' => false,
17+
])
18+
->setFinder($finder)
1419
->setUsingCache(true);

.travis.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
language: php
22

33
php:
4-
- 5.4
5-
- 5.5
6-
- 5.6
7-
- 7.0
8-
- hhvm
4+
- 7.1
95

106
before_install:
117
- travis_retry composer self-update
128
install:
139
- travis_retry composer install --no-interaction --prefer-source --dev
1410

1511
script:
16-
- bin/phpunit --verbose
12+
- vendor/bin/phpunit --verbose
1713

18-
matrix:
19-
allow_failures:
20-
- php: hhvm
21-
- php: 7.0
22-
fast_finish: true

README.md

Lines changed: 7 additions & 11 deletions

composer.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@
55
"type": "library",
66
"license": "BSD-3-Clause",
77
"require": {
8-
"php": ">=5.4",
9-
"symfony/framework-bundle": ">=2.3",
10-
"symfony/form": ">=2.3"
8+
"php": ">=7.1",
9+
"symfony/form": "^2.8|^3.0"
1110
},
1211
"require-dev": {
13-
"phpunit/phpunit": "4.6.*",
14-
"symfony/validator": "~2.3",
15-
"fabpot/php-cs-fixer": "~1.9"
16-
},
17-
"config": {
18-
"bin-dir": "bin"
12+
"phpunit/phpunit": "^5.7",
13+
"symfony/validator": "^2.8|^3.0",
14+
"friendsofphp/php-cs-fixer": "^2.0",
15+
"symfony/security": "^2.8|^3.0"
1916
},
2017
"autoload": {
2118
"psr-4": {
22-
"Linio\\DynamicFormBundle\\": ""
19+
"Linio\\DynamicFormBundle\\": "src/"
2320
}
2421
}
2522
}

phpunit.xml.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,20 @@
1212
bootstrap="./vendor/autoload.php">
1313
<testsuites>
1414
<testsuite name="Linio Framework Test Suite">
15-
<directory suffix="Test.php">./Tests</directory>
15+
<directory suffix="Test.php">./tests</directory>
1616
</testsuite>
1717
</testsuites>
1818
<filter>
1919
<whitelist addUncoveredFilesFromWhitelist="true">
2020
<directory suffix=".php">./DynamicFormBundle</directory>
2121
<exclude>
2222
<directory suffix=".php">./vendor</directory>
23-
<directory suffix=".php">./Tests</directory>
23+
<directory suffix=".php">./tests</directory>
2424
</exclude>
2525
</whitelist>
2626
<blacklist>
2727
<directory suffix=".php">./vendor</directory>
28-
<directory suffix=".php">./Tests</directory>
28+
<directory suffix=".php">./tests</directory>
2929
</blacklist>
3030
</filter>
3131
<logging>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)