Skip to content

Commit 2c02ab5

Browse files
authored
Merge pull request #199 from anthonykgross/fix-deprecations-sf4.4+
fix deprecations
2 parents 2ed308e + 23a04eb commit 2c02ab5

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Resources/config/routing.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
feed_stream:
22
path: /stream/{format}/{id}
3-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, format: 'rss' }
3+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, format: 'rss' }
44
requirements: { "format": "rss|atom|json" }
55

66
feed_rss:
77
path: /rss/{id}
8-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'rss', "id": null }
8+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'rss', "id": null }
99

1010
feed_atom:
1111
path: /atom/{id}
12-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'atom', "id": null }
12+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'atom', "id": null }
1313

1414
feed_json:
1515
path: /json/{id}
16-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'json', "id": null }
16+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'json', "id": null }
1717

1818
feed_mock:
1919
path: /mock/rss/{id}
20-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'rss', "id": null }
20+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'rss', "id": null }

Tests/Controller/App/routing.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="debril_rss_atom_mock_rss" path="/mock/rss/{id}">
8-
<default key="_controller">DebrilRssAtomBundle:Stream:index</default>
8+
<default key="_controller">Debril\RssAtomBundle\Controller\StreamController::indexAction</default>
99
<default key="format">rss</default>
1010
<default key="source">debril.provider.mock</default>
1111
<default key="id">null</default>
1212
</route>
1313

1414
<route id="debril_rss_atom_bad_provider" path="/bad/provider">
15-
<default key="_controller">DebrilRssAtomBundle:Stream:index</default>
15+
<default key="_controller">Debril\RssAtomBundle\Controller\StreamController::indexAction</default>
1616
<default key="format">rss</default>
1717
<default key="source">debril.parser.rss</default>
1818
<default key="id">null</default>

Tests/Controller/App/routing.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
feed_stream:
22
path: /stream/{format}/{id}
3-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, format: 'rss' }
3+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, format: 'rss' }
44
requirements: { "format": "rss|atom|json" }
55

66
feed_rss:
77
path: /rss/{id}
8-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'rss', "id": null }
8+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'rss', "id": null }
99

1010
feed_atom:
1111
path: /atom/{id}
12-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'atom', "id": null }
12+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'atom', "id": null }
1313

1414
feed_json:
1515
path: /json/{id}
16-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'json', "id": null }
16+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'json', "id": null }
1717

1818
feed_mock:
1919
path: /mock/rss/{id}
20-
defaults: { _controller: DebrilRssAtomBundle:Stream:index, "format": 'rss', "id": null }
20+
defaults: { _controller: Debril\RssAtomBundle\Controller\StreamController::indexAction, "format": 'rss', "id": null }

0 commit comments

Comments
 (0)