8000 Merge branch '3.4' into 4.2 · GaryPEGEOT/symfony@a72c0ac · GitHub
[go: up one dir, main page]
Skip to content

Commit a72c0ac

Browse files
fabpotfabpot
committed
Merge branch '3.4' into 4.2
* 3.4: moved XSD to HTTPS
2 parents 50dc0d2 + e3c0878 commit a72c0ac

30 files changed

+30
-30
lines changed

‎src/Symfony/Bundle/TwigBundle/Resources/config/routing/errors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="_twig_error_test" path="/{code}.{_format}">
88
<default key="_controller">twig.controller.preview_error::previewErrorPageAction</default>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/profiler.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="_profiler_home" path="/">
88
<default key="_controller">web_profiler.controller.profiler::homeAction</default>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/config/routing/wdt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="_wdt" path="/{token}">
88
<default key="_controller">web_profiler.controller.profiler::toolbarAction</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/controller/import__controller.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="routing.xml">
88
<default key="_controller">FrameworkBundle:Template:template</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/controller/import_controller.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="routing.xml" controller="FrameworkBundle:Template:template" />
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/controller/import_override_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="routing.xml" controller="FrameworkBundle:Template:template">
88
<default key="_controller">AppBundle:Blog:index</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/controller/override_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="app_blog" path="/blog" controller="AppBundle:Homepage:show">
88
<default key="_controller">AppBundle:Blog:index</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/controller/routing.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="app_homepage" path="/" controller="AppBundle:Homepage:show" />
88

‎src/Symfony/Component/Routing/Tests/Fixtures/glob/bar.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="bar_route" path="/bar" controller="AppBundle:Bar:view" />
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/glob/baz.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="baz_route" path="/baz" controller="AppBundle:Baz:view" />
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/glob/import_multiple.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="ba?.xml" />
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/glob/import_single.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="b?r.xml" />
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/list_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/list_in_list_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/list_in_map_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/list_null_values.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/map_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/map_in_list_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/map_in_map_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/map_null_values.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/missing_id.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route path="/test"></route>
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/missing_path.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="myroute"></route>
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/namespaceprefix.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<r:routes xmlns:r="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<r:route id="blog_show" path="/blog/{slug}" host="{_locale}.example.com">
88
<r:default key="_controller">MyBundle:Blog:show</r:default>

‎src/Symfony/Component/Routing/Tests/Fixtures/nonvalid.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog_show" path="/blog/{slug}">
88
<default key="_controller">MyBundle:Blog:show</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/nonvalidnode.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<foo>bar</foo>
88
</routes>

‎src/Symfony/Component/Routing/Tests/Fixtures/nonvalidroute.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog_show" path="/blog/{slug}">
88
<default key="_controller">MyBundle:Blog:show</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/null_values.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
4+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
55

66
<route id="blog_show" path="/blog/{slug}">
77
<default key="foo" xsi:nil="true" />

‎src/Symfony/Component/Routing/Tests/Fixtures/scalar_defaults.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes xmlns="http://symfony.com/schema/routing"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xsi:schemaLocation="http://symfony.com/schema/routing
5-
http://symfony.com/schema/routing/routing-1.0.xsd">
5+
https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog" path="/blog">
88
<default key="_controller">

‎src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<route id="blog_show" path="/blog/{slug}" host="{locale}.example.com" methods="GET|POST put,OpTiOnS" schemes="hTTps">
88
<default key="_controller">MyBundle:Blog:show</default>

‎src/Symfony/Component/Routing/Tests/Fixtures/validresource.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<routes xmlns="http://symfony.com/schema/routing"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
5+
xsi:schemaLocation="http://symfony.com/schema/routing https://symfony.com/schema/routing/routing-1.0.xsd">
66

77
<import resource="validpattern.xml" prefix="/{foo}" host="">
88
<default key="foo">123</default>

0 commit comments

Comments
 (0)
0