Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6f459b9

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '3.4' into 4.3
* 3.4: Remove Google references when not needed
2 parents 2c87f69 + f436cc8 commit 6f459b9
Copy full SHA for 6f459b9

File tree

6 files changed

+30
-30
lines changed
Filter options

6 files changed

+30
-30
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Tests/Extension/AbstractBootstrap3LayoutTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,31 +2571,31 @@ public function testTimezoneWithPlaceholder()
25712571

25722572
public function testUrlWithDefaultProtocol()
25732573
{
2574-
$url = 'http://www.google.com?foo1=bar1&foo2=bar2';
2574+
$url = 'http://www.example.com?foo1=bar1&foo2=bar2';
25752575
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => 'http']);
25762576

25772577
$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
25782578
'/input
25792579
[@type="text"]
25802580
[@name="name"]
25812581
[@class="my&class form-control"]
2582-
[@value="http://www.google.com?foo1=bar1&foo2=bar2"]
2582+
[@value="http://www.example.com?foo1=bar1&foo2=bar2"]
25832583
[@inputmode="url"]
25842584
'
25852585
);
25862586
}
25872587

25882588
public function testUrlWithoutDefaultProtocol()
25892589
{
2590-
$url = 'http://www.google.com?foo1=bar1&foo2=bar2';
2590+
$url = 'http://www.example.com?foo1=bar1&foo2=bar2';
25912591
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => null]);
25922592

25932593
$this->assertWidgetMatchesXpath($form->createView(), ['attr' => ['class' => 'my&class']],
25942594
'/input
25952595
[@type="url"]
25962596
[@name="name"]
25972597
[@class="my&class form-control"]
2598-
[@value="http://www.google.com?foo1=bar1&foo2=bar2"]
2598+
[@value="http://www.example.com?foo1=bar1&foo2=bar2"]
25992599
'
26002600
);
26012601
}

‎src/Symfony/Component/BrowserKit/Tests/CookieTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/Tests/CookieTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public function getTestsForToFromString()
4747
return [
4848
['foo=bar; path=/'],
4949
['foo=bar; path=/foo'],
50-
['foo=bar; domain=google.com; path=/'],
50+
['foo=bar; domain=example.com; path=/'],
5151
['foo=bar; domain=example.com; path=/; secure', 'https://example.com/'],
5252
['foo=bar; path=/; httponly'],
53-
['foo=bar; domain=google.com; path=/foo; secure; httponly', 'https://google.com/'],
53+
['foo=bar; domain=example.com; path=/foo; secure; httponly', 'https://example.com/'],
5454
['foo=bar=baz; path=/'],
5555
['foo=bar%3Dbaz; path=/'],
5656
];

‎src/Symfony/Component/Form/Tests/AbstractLayoutTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2301,29 +2301,29 @@ public function testTimezoneWithPlaceholder()
23012301

23022302
public function testUrlWithDefaultProtocol()
23032303
{
2304-
$url = 'http://www.google.com?foo1=bar1&foo2=bar2';
2304+
$url = 'http://www.example.com?foo1=bar1&foo2=bar2';
23052305
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => 'http']);
23062306

23072307
$this->assertWidgetMatchesXpath($form->createView(), [],
23082308
'/input
23092309
[@type="text"]
23102310
[@name="name"]
2311-
[@value="http://www.google.com?foo1=bar1&foo2=bar2"]
2311+
[@value="http://www.example.com?foo1=bar1&foo2=bar2"]
23122312
[@inputmode="url"]
23132313
'
23142314
);
23152315
}
23162316

23172317
public function testUrlWithoutDefaultProtocol()
23182318
{
2319-
$url = 'http://www.google.com?foo1=bar1&foo2=bar2';
2319+
$url = 'http://www.example.com?foo1=bar1&foo2=bar2';
23202320
$form = $this->factory->createNamed('name', 'Symfony\Component\Form\Extension\Core\Type\UrlType', $url, ['default_protocol' => null]);
23212321

23222322
$this->assertWidgetMatchesXpath($form->createView(), [],
23232323
'/input
23242324
[@type="url"]
23252325
[@name="name"]
2326-
[@value="http://www.google.com?foo1=bar1&foo2=bar2"]
2326+
[@value="http://www.example.com?foo1=bar1&foo2=bar2"]
23272327
'
23282328
);
23292329
}

‎src/Symfony/Component/HttpKernel/Tests/HttpKernelBrowserTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/HttpKernelBrowserTest.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function testDoRequest()
3939
$this->assertEquals('Request: /', $client->getResponse()->getContent(), '->doRequest() uses the request handler to make the request');
4040
$this->assertEquals('www.example.com', $client->getRequest()->getHost(), '->doRequest() uses the request handler to make the request');
4141

42-
$client->request('GET', 'http://www.example.com/?parameter=http://google.com');
43-
$this->assertEquals('http://www.example.com/?parameter='.urlencode('http://google.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
42+
$client->request('GET', 'http://www.example.com/?parameter=http://example.com');
43+
$this->assertEquals('http://www.example.com/?parameter='.urlencode('http://example.com'), $client->getRequest()->getUri(), '->doRequest() uses the request handler to make the request');
4444
}
4545

4646
public function testGetScript()

‎src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Tests/Constraints/UrlValidatorTest.php
+15-15Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ public function getValidUrls()
101101
{
102102
return [
103103
['http://a.pl'],
104-
['http://www.google.com'],
105-
['http://www.google.com.'],
106-
['http://www.google.museum'],
107-
['https://google.com/'],
108-
['https://google.com:80/'],
104+
['http://www.example.com'],
105+
['http://www.example.com.'],
106+
['http://www.example.museum'],
107+
['https://example.com/'],
108+
['https://example.com:80/'],
109109
['http://www.example.coop/'],
110110
['http://www.test-example.com/'],
111111
['http://www.symfony.com/'],
@@ -235,15 +235,15 @@ public function getInvalidRelativeUrls()
235235
public function getInvalidUrls()
236236
{
237237
return [
238-
['google.com'],
239-
['://google.com'],
240-
['http ://google.com'],
241-
['http:/google.com'],
242-
['http://goog_le.com'],
243-
['http://google.com::aa'],
244-
['http://google.com:aa'],
245-
['ftp://google.fr'],
246-
['faked://google.fr'],
238+
['example.com'],
239+
['://example.com'],
240+
['http ://example.com'],
241+
['http:/example.com'],
242+
['http://examp_le.com'],
243+
['http://example.com::aa'],
244+
['http://example.com:aa'],
245+
['ftp://example.fr'],
246+
['faked://example.fr'],
247247
['http://127.0.0.1:aa/'],
248248
['ftp://[::1]/'],
249249
['http://[::1'],
@@ -276,7 +276,7 @@ public function testCustomProtocolIsValid($url)
276276
public function getValidCustomUrls()
277277
{
278278
return [
279-
['ftp://google.com'],
279+
['ftp://example.com'],
280280
['file://127.0.0.1'],
281281
['git://[::1]/'],
282282
];

‎src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ public function getCastFileInfoTests()
5050
%A}
5151
EOTXT
5252
],
53-
['https://google.com/about', <<<'EOTXT'
53+
['https://example.com/about', <<<'EOTXT'
5454
SplFileInfo {
55-
%Apath: "https://google.com"
55+
%Apath: "https://example.com"
5656
filename: "about"
5757
basename: "about"
58-
pathname: "https://google.com/about"
58+
pathname: "https://example.com/about"
5959
extension: ""
6060
realPath: false
6161
%A}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.