Skip to content
This repository was archived by the owner on Dec 26, 2017. It is now read-only.

Commit 8f30a6b

Browse files
authored
Merge pull request #9 from SimpleBus/php-56
Drop support for php 5.4 and 5.5
2 parents 126c3a4 + 7549014 commit 8f30a6b

3 files changed

Lines changed: 31 additions & 22 deletions

File tree

.travis.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
1-
language: php
1+
sudo: false
22

3-
php:
4-
- 5.4
5-
- 5.5
6-
- 5.6
7-
- 7.0
8-
- hhvm
3+
language: php
94

105
matrix:
11-
allow_failures:
12-
- php: hhvm
6+
include:
7+
- php: 5.6
8+
- php: 7.0
9+
- php: 7.1
10+
env: SYMFONY_VERSION=2.7.*
11+
- php: 7.1
12+
env: SYMFONY_VERSION=2.8.*
13+
- php: 7.1
14+
env: SYMFONY_VERSION=3.2.*
15+
- php: 7.1
16+
env: SYMFONY_VERSION=3.3.*
17+
allow_failures:
18+
- php: 7.1
19+
env: SYMFONY_VERSION=3.3.*
20+
21+
env:
22+
global:
23+
- SYMFONY_VERSION=""
1324

1425
before_install:
15-
- composer self-update
26+
- composer self-update
27+
- if [ "$SYMFONY_VERSION" != "" ]; then composer require --no-update symfony/console:$SYMFONY_VERSION symfony/process:$SYMFONY_VERSION symfony/finder:$SYMFONY_VERSION; fi
1628

1729
install:
18-
- composer install --no-progress
30+
- composer install --prefer-dist
1931

2032
script:
21-
- bin/phpunit
33+
- vendor/bin/phpunit
2234

2335
after_success:
24-
- bash <(curl -s https://codecov.io/bash)
36+
- bash <(curl -s https://codecov.io/bash)

composer.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^5.4|^7.0",
15+
"php": "^5.6 || ^7.0",
1616
"simple-bus/message-bus": "~2.0",
1717
"simple-bus/asynchronous-bundle": "~2.0",
1818
"simple-bus/asynchronous": "~2.0",
@@ -42,8 +42,5 @@
4242
"psr-4": {
4343
"SimpleBus\\BernardBundleBridge\\Tests\\": "tests"
4444
}
45-
},
46-
"config": {
47-
"bin-dir": "bin"
4845
}
4946
}

src/Encrypter/NelmioEncrypter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct($secret, $algorithm)
2727
$this->algorithm));
2828
}
2929

30-
$this->ivSize = mcrypt_enc_get_iv_size($this->module);
30+
$this->ivSize = @mcrypt_enc_get_iv_size($this->module);
3131
}
3232

3333
public function encrypt($input)
@@ -36,11 +36,11 @@ public function encrypt($input)
3636
return;
3737
}
3838

39-
$iv = mcrypt_create_iv($this->ivSize, MCRYPT_RAND);
39+
$iv = @mcrypt_create_iv($this->ivSize, MCRYPT_RAND);
4040

41-
mcrypt_generic_init($this->module, $this->secret, $iv);
41+
@mcrypt_generic_init($this->module, $this->secret, $iv);
4242

43-
return rtrim(base64_encode($iv.mcrypt_generic($this->module, (string) $input)), '=');
43+
return rtrim(base64_encode($iv.@mcrypt_generic($this->module, (string) $input)), '=');
4444
}
4545

4646
public function decrypt($input)
@@ -64,6 +64,6 @@ public function decrypt($input)
6464
return;
6565
}
6666

67-
return rtrim(mdecrypt_generic($this->module, $encryptedData), "\0");
67+
return rtrim(@mdecrypt_generic($this->module, $encryptedData), "\0");
6868
}
6969
}

0 commit comments

Comments
 (0)