Skip to content

Commit 6ed18ca

Browse files
wtfzdotnetwtfzdotnet
authored
Merge pull request #201 from DariusIII/patch-1
Allow symfony 5 components
2 parents 09fa8dc + 2f5c57f commit 6ed18ca

Some content is hidden

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

49 files changed

+81
-136
lines changed

‎.travis.yml‎

Lines changed: 8 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ sudo: false
22
language: php
33

44
php:
5-
- 5.6
5+
- 7.1
66
- nightly
7-
- hhvm
87

98
before_script:
109
- composer self-update
@@ -16,80 +15,21 @@ script: vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover --v
1615

1716
matrix:
1817
include:
19-
- php: 5.6
20-
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
21-
- php: 5.6
22-
env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
23-
- php: 5.6
24-
env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
25-
- php: 5.6
26-
env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
27-
- php: 5.6
28-
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
29-
- php: 5.6
30-
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
31-
32-
- php: 7.0
33-
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
34-
- php: 7.0
35-
env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
36-
- php: 7.0
37-
env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
38-
- php: 7.0
39-
env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
40-
- php: 7.0
41-
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
42-
- php: 7.0
43-
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
44-
45-
- php: 7.1
46-
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
47-
- php: 7.1
48-
env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
49-
- php: 7.1
50-
env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
51-
- php: 7.1
52-
env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
53-
- php: 7.1
54-
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
5518
- php: 7.1
56-
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
57-
- php: 7.1
58-
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
19+
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.4"]
20+
5921

6022
- php: 7.2
61-
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
62-
- php: 7.2
63-
env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
64-
- php: 7.2
65-
env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
66-
- php: 7.2
67-
env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
68-
- php: 7.2
69-
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
70-
- php: 7.2
71-
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
23+
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.4"]
7224
- php: 7.2
73-
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
25+
env: [SF_EVT_DISPATCHER_VERSION="^5.0", SF_OPT_RESOLVER_VERSION="^5.0"]
26+
27+
- php: 7.3
28+
env: [SF_EVT_DISPATCHER_VERSION="^5.0", SF_OPT_RESOLVER_VERSION="^5.0"]
7429

75-
- php: hhvm
76-
env: [SF_EVT_DISPATCHER_VERSION="2.7.*", SF_OPT_RESOLVER_VERSION="2.7.*"]
77-
- php: hhvm
78-
env: [SF_EVT_DISPATCHER_VERSION="2.8.*", SF_OPT_RESOLVER_VERSION="2.8.*"]
79-
- php: hhvm
80-
env: [SF_EVT_DISPATCHER_VERSION="3.0.*", SF_OPT_RESOLVER_VERSION="3.0.*"]
81-
- php: hhvm
82-
env: [SF_EVT_DISPATCHER_VERSION="3.1.*", SF_OPT_RESOLVER_VERSION="3.1.*"]
83-
- php: hhvm
84-
env: [SF_EVT_DISPATCHER_VERSION="3.2.*", SF_OPT_RESOLVER_VERSION="3.2.*"]
85-
- php: hhvm
86-
env: [SF_EVT_DISPATCHER_VERSION="^3.3", SF_OPT_RESOLVER_VERSION="^3.3"]
87-
- php: hhvm
88-
env: [SF_EVT_DISPATCHER_VERSION="^4.0", SF_OPT_RESOLVER_VERSION="^4.0"]
8930

9031
allow_failures:
9132
- php: nightly
92-
- php: hhvm
9333
fast_finish: true
9434

9535
after_script:

‎composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
}
1414
],
1515
"require": {
16-
"php": ">=5.6.0",
16+
"php": ">=7.1.3",
1717
"ext-curl": "*",
18-
"symfony/event-dispatcher": ">=2.4,<5",
19-
"symfony/options-resolver": ">=2.6,<5",
18+
"symfony/event-dispatcher": ">=4.4,<6",
19+
"symfony/options-resolver": ">=4.4,<6",
2020
"guzzlehttp/guzzle": "~6.0",
2121
"psr/log": "~1.0",
2222
"doctrine/cache": "^1.6",
2323
"kevinrob/guzzle-cache-middleware": "^1.2 || ^2.0",
2424
"rtheunissen/guzzle-log-middleware": "^0.4.0"
2525
},
2626
"require-dev": {
27-
"phpunit/phpunit": ">=5.7,<6",
27+
"phpunit/phpunit": "^5.0",
2828
"monolog/monolog": ">=1.11.0"
2929
},
3030
"suggest": {

‎lib/Tmdb/Event/HydrationEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
namespace Tmdb\Event;
1414

15-
use Symfony\Component\EventDispatcher\Event;
15+
use Symfony\Contracts\EventDispatcher\Event;
1616
use Tmdb\HttpClient\Request;
1717
use Tmdb\HttpClient\Response;
1818
use Tmdb\Model\AbstractModel;

‎lib/Tmdb/Event/HydrationSubscriber.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static function getSubscribedEvents()
4646
public function hydrate(HydrationEvent $event, $eventName, $eventDispatcher)
4747
{
4848
// Possibility to load serialized cache
49-
$eventDispatcher->dispatch(TmdbEvents::BEFORE_HYDRATION, $event);
49+
$eventDispatcher->dispatch( $event,TmdbEvents::BEFORE_HYDRATION);
5050

5151
if ($event->isPropagationStopped()) {
5252
return $event->getSubject();
@@ -56,7 +56,7 @@ public function hydrate(HydrationEvent $event, $eventName, $eventDispatcher)
5656
$event->setSubject($subject);
5757

5858
// Possibility to cache the data
59-
$eventDispatcher->dispatch(TmdbEvents::AFTER_HYDRATION, $event);
59+
$eventDispatcher->dispatch( $event, TmdbEvents::AFTER_HYDRATION);
6060

6161
return $event->getSubject();
6262
}

‎lib/Tmdb/Event/RequestEvent.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
namespace Tmdb\Event;
1414

15-
use Symfony\Component\EventDispatcher\Event;
15+
use Symfony\Contracts\EventDispatcher\Event;
1616
use Tmdb\Common\ParameterBag;
1717
use Tmdb\HttpClient\Request;
1818
use Tmdb\HttpClient\Response;

‎lib/Tmdb/Event/RequestSubscriber.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static function getSubscribedEvents()
4040
public function send(RequestEvent $event, $eventName, EventDispatcherInterface $eventDispatcher)
4141
{
4242
// Preparation of request parameters / Possibility to use for logging and caching etc.
43-
$eventDispatcher->dispatch(TmdbEvents::BEFORE_REQUEST, $event);
43+
$eventDispatcher->dispatch($event,TmdbEvents::BEFORE_REQUEST);
4444

4545
if ($event->isPropagationStopped() && $event->hasResponse()) {
4646
return $event->getResponse();
@@ -50,7 +50,7 @@ public function send(RequestEvent $event, $eventName, EventDispatcherInterface $
5050
$event->setResponse($response);
5151

5252
// Possibility to cache the request
53-
$eventDispatcher->dispatch(TmdbEvents::AFTER_REQUEST, $event);
53+
$eventDispatcher->dispatch($event, TmdbEvents::AFTER_REQUEST);
5454

5555
return $response;
5656
}

‎lib/Tmdb/Factory/AbstractFactory.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ protected function hydrate(AbstractModel $subject, $data = [])
248248
$event->setLastRequest($httpClient->getLastRequest());
249249
$event->setLastResponse($httpClient->getLastResponse());
250250

251-
$this->getHttpClient()->getEventDispatcher()->dispatch(TmdbEvents::HYDRATE, $event);
251+
$this->getHttpClient()->getEventDispatcher()->dispatch($event, TmdbEvents::HYDRATE);
252252

253253
return $event->getSubject();
254254
}

‎lib/Tmdb/HttpClient/HttpClient.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private function send($path, $method, array $parameters = [], array $headers = [
234234
);
235235

236236
$event = new RequestEvent($request);
237-
$this->eventDispatcher->dispatch(TmdbEvents::REQUEST, $event);
237+
$this->eventDispatcher->dispatch($event, TmdbEvents::REQUEST);
238238

239239
$this->lastResponse = $event->getResponse();
240240

‎phpunit.xml.dist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
bootstrap="test/bootstrap.php"
1312
>
1413
<testsuites>

‎test/Tmdb/Tests/ApiTokenTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
namespace Tmdb\Tests;
1414

15-
class ApiTokenTest extends \PHPUnit_Framework_TestCase
15+
class ApiTokenTest extends \PHPUnit\Framework\TestCase
1616
{
1717
const API_TOKEN = 'abcdefg';
1818

0 commit comments

Comments
 (0)