Skip to content

Commit 884fb5d

Browse files
committed
change test data to fix failing tests with Symfony 2.8
1 parent 79a8a42 commit 884fb5d

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

tests/Functional/Bundle/TestBundle/Controller/UrlRewritingInControllersController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UrlRewritingInControllersController extends Controller
2626
public function indexAction(Request $request)
2727
{
2828
return $this->render('TestBundle:UrlRewritingInControllers:index.html.twig', array(
29-
'data' => $this->generateUrl('test_url_rewriting_in_controllers_index', array(), $request->query->get('referenceType')),
29+
'data' => $this->generateUrl('test_url_rewriting_in_controllers_index', array(), (int) $request->query->get('referenceType')),
3030
));
3131
}
3232
}

tests/Functional/Bundle/TestBundle/Controller/UrlRewritingInTemplatesController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class UrlRewritingInTemplatesController extends Controller
2626
public function indexAction(Request $request)
2727
{
2828
return $this->render('TestBundle:UrlRewritingInTemplates:index.html.twig', array(
29-
'referenceType' => $request->query->get('referenceType'),
29+
'referenceType' => (bool) $request->query->get('referenceType'),
3030
));
3131
}
3232
}

tests/Functional/UrlRewritingInControllersTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@ public function rewriteUrlInGenerateUrlData()
6666
{
6767
return array(
6868
array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
69-
array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, '/foo/bar/url-rewriting-in-controllers/'),
69+
array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://backend1.example.com/foo/bar/url-rewriting-in-controllers/'),
7070
array('/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//backend1.example.com/foo/bar/url-rewriting-in-controllers/'),
7171
array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
72-
array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, '/foo/bar/url-rewriting-in-controllers/'),
72+
array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/url-rewriting-in-controllers/'),
7373
array('//example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
7474
array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
75-
array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, '/foo/bar/url-rewriting-in-controllers/'),
75+
array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/url-rewriting-in-controllers/'),
7676
array('http://example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
7777
array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
78-
array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, '/foo/bar/url-rewriting-in-controllers/'),
78+
array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'https://example.com/foo/bar/url-rewriting-in-controllers/'),
7979
array('https://example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
8080
);
8181
}

tests/Functional/UrlRewritingInTemplatesTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ protected function removeCacheDir()
6868
public function rewriteUrlInAssetData()
6969
{
7070
return array(
71-
array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/bundles/test/foo.png'),
72-
array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/bundles/test/foo.png'),
73-
array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/bundles/test/foo.png'),
74-
array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/bundles/test/foo.png'),
75-
array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/bundles/test/foo.png'),
76-
array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/bundles/test/foo.png'),
77-
array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'https://example.com/foo/bar/bundles/test/foo.png'),
71+
array('/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
72+
array('//example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
73+
array('//example.com/foo/bar/', true, 'http://example.com/foo/bar/bundles/test/foo.png'),
74+
array('http://example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
75+
array('http://example.com/foo/bar/', true, 'http://example.com/foo/bar/bundles/test/foo.png'),
76+
array('https://example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
77+
array('https://example.com/foo/bar/', true, 'https://example.com/foo/bar/bundles/test/foo.png'),
7878
);
7979
}
8080

0 commit comments

Comments
 (0)