Skip to content
This repository was archived by the owner on Jul 12, 2020. It is now read-only.

Commit 3d2b9ee

Browse files
committed
Merge branch 'develop'
2 parents af5f2b3 + 51e598f commit 3d2b9ee

File tree

314 files changed

+1363
-514
lines changed

Some content is hidden

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

314 files changed

+1363
-514
lines changed

.php_cs.dist

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
$header = <<<'EOF'
46
This file is part of the PcdxParameterEncryptionBundle package.
57
@@ -12,7 +14,8 @@ EOF;
1214
return \PhpCsFixer\Config::create()
1315
->setRiskyAllowed(true)
1416
->setRules([
15-
'@PHP56Migration' => true,
17+
'@PHP70Migration' => true,
18+
'@PHP70Migration:risky' => true,
1619
'@Symfony' => true,
1720
'@Symfony:risky' => true,
1821

.travis.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,29 @@ language: php
33
dist: trusty
44

55
php:
6-
- 5.6
7-
- 7.0
86
- 7.1
97
- 7.2
10-
- hhvm
8+
- 7.3
119

1210
env:
1311
global:
14-
- COVERALLS_EXECUTION_PHP_VERSION="7.2"
12+
- COVERALLS_EXECUTION_PHP_VERSION="7.3"
1513
- PHP_CS_FIXER_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE}"
16-
- PHP_CS_FIXER_EXECUTION_PHP_VERSION="7.2"
14+
- PHP_CS_FIXER_EXECUTION_PHP_VERSION="7.3"
1715

1816
matrix:
1917
fast_finish: true
2018
include:
2119
# Test against Symfony LTS versions
22-
- php: 5.6
20+
- php: 7.1
2321
env: SYMFONY_VERSION="2.7.*"
24-
- php: 5.6
22+
- php: 7.1
2523
env: SYMFONY_VERSION="2.8.*"
26-
- php: 5.6
24+
- php: 7.1
2725
env: SYMFONY_VERSION="3.4.*"
2826
# Test against dev versions
29-
- php: 5.6
27+
- php: 7.1
3028
env: DEPENDENCIES=dev
31-
allow_failures:
32-
- php: hhvm
3329

3430
sudo: false
3531

@@ -39,8 +35,8 @@ cache:
3935

4036
before_install:
4137
- composer self-update
42-
- if [[ $(phpenv version-name) == "$COVERALLS_EXECUTION_PHP_VERSION" ]]; then composer require "satooshi/php-coveralls:^1.0" --no-update -n; fi
43-
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
38+
- if [[ $(phpenv version-name) == "$COVERALLS_EXECUTION_PHP_VERSION" ]]; then composer require "php-coveralls/php-coveralls:^2.1" --no-update -n; fi
39+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update -n; fi
4440

4541
install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
4642

@@ -52,4 +48,4 @@ script:
5248
- if [[ $(phpenv version-name) == "$PHP_CS_FIXER_EXECUTION_PHP_VERSION" ]]; then ./vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no --path-mode=intersection -- "${COMMIT_SCA_FILES[@]}"; fi
5349

5450
after_script:
55-
- if [[ $(phpenv version-name) == "$COVERALLS_EXECUTION_PHP_VERSION" ]]; then ./vendor/bin/coveralls -v; fi
51+
- if [[ $(phpenv version-name) == "$COVERALLS_EXECUTION_PHP_VERSION" ]]; then ./vendor/bin/php-coveralls -v; fi

CHANGELOG.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,31 @@ This project adheres to [Semantic Versioning](http://semver.org/).
2828

2929
* (empty)
3030

31+
## 1.2.0 (2019-01-14)
32+
33+
### Added
34+
35+
* Added Composer dev package "symfony/phpunit-bridge" to enable deprecation notices for tests
36+
* Added strict typing
37+
38+
### Changed
39+
40+
* Made minor improvements in Travis CI configuration
41+
* PHP CS Fixer: Replaced rule set PHP56Migration with PHP70Migration and PHP70Migration:risky
42+
* Set error_reporting level for tests to -1
43+
* Updated Travis CI configuration for PHP 5.6 (end of life), PHP 7.0 (end of life), PHP 7.3 (new default) and HHVM (no longer supports PHP)
44+
* Updated Travis CI configuration to use new Coveralls Composer package and version (2.1)
45+
* Upgraded to PHPUnit 6.2+
46+
47+
### Removed
48+
49+
* Removed support for PHP 5.6 and 7.0 (reached end of life)
50+
51+
### Fixed
52+
53+
* Fixed deprecations when instantiating TreeBuilder in Configuration
54+
* PHP CS Fixer: Applied native constant invocation and native function invocation
55+
3156
## 1.1.1 (2018-03-06)
3257

3358
### Added

Command/AlgorithmListCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Command/DecryptCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Command/EncryptCommand.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Configuration/AlgorithmConfiguration.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Configuration/AlgorithmConfigurationContainer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Configuration/AlgorithmConfigurationContainerInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*

Configuration/AlgorithmConfigurationFactory.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/*
46
* This file is part of the PcdxParameterEncryptionBundle package.
57
*
@@ -92,7 +94,7 @@ private function containsValidCryptoConfig($algorithmConfig, $type)
9294
{
9395
return (
9496
array_key_exists($type, $algorithmConfig)
95-
&& is_array($algorithmConfig[$type])
97+
&& \is_array($algorithmConfig[$type])
9698
&& array_key_exists('key', $algorithmConfig[$type])
9799
&& array_key_exists('service', $algorithmConfig[$type])
98100
);

0 commit comments

Comments
 (0)