10000 Rename Symfony2 to Symfony · symfony/symfony@0a76b7e · GitHub
[go: up one dir, main page]
Skip to content

Commit 0a76b7e

Browse files
romainneutronromainneutron
committed
Rename Symfony2 to Symfony
1 parent da1c1c5 commit 0a76b7e

File tree

28 files changed

+62
-62
lines changed
Filter options

28 files changed

+62
-62
lines changed

‎CONTRIBUTING.md

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

4-
Symfony2 is an open source, community-driven project. If you'd like to contribute,
4+
Symfony is an open source, community-driven project. If you'd like to contribute,
55
please read the [Contributing Code][1] part of the documentation. If you're submitting
66
a pull request, please follow the guidelines in the [Submitting a Patch][2] section
77
and use the [Pull Request Template][3].

‎CONTRIBUTORS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CONTRIBUTORS
22
============
33

4-
Symfony2 is the result of the work of many people who made the code better
4+
Symfony is the result of the work of many people who made the code better
55
(see http://symfony.com/contributors for more information):
66

77
- Fabien Potencier (fabpot)

‎README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
README
22
======
33

4-
What is Symfony2?
4+
What is Symfony?
55
-----------------
66

7-
Symfony2 is a PHP 5.3 full-stack web framework. It is written with speed and
7+
Symfony is a PHP 5.3 full-stack web framework. It is written with speed and
88
flexibility in mind. It allows developers to build better and easy to maintain
99
websites with PHP.
1010

@@ -14,7 +14,7 @@ to high traffic ones like Dailymotion or Yahoo! Answers.
1414
Requirements
1515
------------
1616

17-
Symfony2 is only supported on PHP 5.3.3 and up.
17+
Symfony is only supported on PHP 5.3.3 and up.
1818

1919
Be warned that PHP versions before 5.3.8 are known to be buggy and might not
2020
work for you:
@@ -28,35 +28,35 @@ work for you:
2828
known PHP bug (see https://bugs.php.net/bug.php?id=55156).
2929

3030
* PHP 5.3.16 has a major bug in the Reflection subsystem and is not suitable to
31-
run Symfony2 (https://bugs.php.net/bug.php?id=62715)
31+
run Symfony (https://bugs.php.net/bug.php?id=62715)
3232

3333
Installation
3434
------------
3535

36-
The best way to install Symfony2 is to download the Symfony Standard Edition
36+
The best way to install Symfony is to download the Symfony Standard Edition
3737
available at [http://symfony.com/download][1].
3838

3939
Documentation
4040
-------------
4141

4242
The "[Quick Tour][2]" tutorial gives you a first feeling of the framework. If,
43-
like us, you think that Symfony2 can help speed up your development and take
43+
like us, you think that Symfony can help speed up your development and take
4444
the quality of your work to the next level, read the official
45-
[Symfony2 documentation][3].
45+
[Symfony documentation][3].
4646

4747
Contributing
4848
------------
4949

50-
Symfony2 is an open source, community-driven project. If you'd like to contribute,
50+
Symfony is an open source, community-driven project. If you'd like to contribute,
5151
please read the [Contributing Code][4] part of the documentation. If you're submitting
5252
a pull request, please follow the guidelines in the [Submitting a Patch][5] section
5353
and use [Pull Request Template][6].
5454

55-
Running Symfony2 Tests
55+
Running Symfony Tests
5656
----------------------
5757

58-
Information on how to run the Symfony2 test suite can be found in the
59-
[Running Symfony2 Tests][7] section.
58+
Information on how to run the Symfony test suite can be found in the
59+
[Running Symfony Tests][7] section.
6060

6161
[1]: http://symfony.com/download
6262
[2]: http://symfony.com/get_started

‎src/Symfony/Bridge/Doctrine/README.md

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

44
Provides integration for [Doctrine](http://www.doctrine-project.org/) with
5-
various Symfony2 components.
5+
various Symfony components.
66

77
Resources
88
---------

‎src/Symfony/Bridge/Monolog/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Monolog Bridge
22
==============
33

4-
Provides integration for Monolog with various Symfony2 components.
4+
Provides integration for Monolog with various Symfony components.
55

66
Resources
77
---------

‎src/Symfony/Bridge/Propel1/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Propel Bridge
22
=============
33

4-
Provides integration for Propel with various Symfony2 components.
4+
Provides integration for Propel with various Symfony components.
55

66
Resources
77
---------

‎src/Symfony/Bridge/ProxyManager/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ProxyManager Bridge
22
===================
33

4-
Provides integration for [ProxyManager][1] with various Symfony2 components.
4+
Provides integration for [ProxyManager][1] with various Symfony components.
55

66
Resources
77
---------

‎src/Symfony/Bridge/Twig/README.md

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

44
Provides integration for [Twig](http://twig.sensiolabs.org/) with various
5-
Symfony2 components.
5+
Symfony components.
66

77
Resources
88
---------

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ public function getTransTests()
8989
return array(
9090
// trans tag
9191
array('{% trans %}Hello{% endtrans %}', 'Hello'),
92-
array('{% trans %}%name%{% endtrans %}', 'Symfony2', array('name' => 'Symfony2')),
92+
array('{% trans %}%name%{% endtrans %}', 'Symfony', array('name' => 'Symfony')),
9393

9494
array('{% trans from elsewhere %}Hello{% endtrans %}', 'Hello'),
9595

96-
array('{% trans %}Hello %name%{% endtrans %}', 'Hello Symfony2', array('name' => 'Symfony2')),
97-
array('{% trans with { \'%name%\': \'Symfony2\' } %}Hello %name%{% endtrans %}', 'Hello Symfony2'),
98-
array('{% set vars = { \'%name%\': \'Symfony2\' } %}{% trans with vars %}Hello %name%{% endtrans %}', 'Hello Symfony2'),
96+
array('{% trans %}Hello %name%{% endtrans %}', 'Hello Symfony', array('name' => 'Symfony')),
97+
array('{% trans with { \'%name%\': \'Symfony\' } %}Hello %name%{% endtrans %}', 'Hello Symfony'),
98+
array('{% set vars = { \'%name%\': \'Symfony\' } %}{% trans with vars %}Hello %name%{% endtrans %}', 'Hello Symfony'),
9999

100100
array('{% trans into "fr"%}Hello{% endtrans %}', 'Hello'),
101101

@@ -105,24 +105,24 @@ public function getTransTests()
105105
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
106106
'There is 5 apples', array('count' => 5),),
107107
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
108-
'There is 5 apples (Symfony2)', array('count' => 5, 'name' => 'Symfony2'),),
109-
array('{% transchoice count with { \'%name%\': \'Symfony2\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
110-
'There is 5 apples (Symfony2)', array('count' => 5),),
108+
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony'),),
109+
array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
110+
'There is 5 apples (Symfony)', array('count' => 5),),
111111
array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
112112
'There is no apples', array('count' => 0),),
113113
array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
114114
'There is 5 apples',),
115115

116116
// trans filter
117117
array('{{ "Hello"|trans }}', 'Hello'),
118-
array('{{ name|trans }}', 'Symfony2', array('name' => 'Symfony2')),
119-
array('{{ hello|trans({ \'%name%\': \'Symfony2\' }) }}', 'Hello Symfony2', array('hello' => 'Hello %name%')),
120-
array('{% set vars = { \'%name%\': \'Symfony2\' } %}{{ hello|trans(vars) }}', 'Hello Symfony2', array('hello' => 'Hello %name%')),
118+
array('{{ name|trans }}', 'Symfony', array('name' => 'Symfony')),
119+
array('{{ hello|trans({ \'%name%\': \'Symfony\' }) }}', 'Hello Symfony', array('hello' => 'Hello %name%')),
120+
array('{% set vars = { \'%name%\': \'Symfony\' } %}{{ hello|trans(vars) }}', 'Hello Symfony', array('hello' => 'Hello %name%')),
121121
array('{{ "Hello"|trans({}, "messages", "fr") }}', 'Hello'),
122122

123123
// transchoice filter
124124
array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count) }}', 'There is 5 apples', array('count' => 5)),
125-
array('{{ text|transchoice(5, {\'%name%\': \'Symfony2\'}) }}', 'There is 5 apples (Symfony2)', array('text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)')),
125+
array('{{ text|transchoice(5, {\'%name%\': \'Symfony\'}) }}', 'There is 5 apples (Symfony)', array('text' => '{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%)')),
126126
array('{{ "{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples"|transchoice(count, {}, "messages", "fr") }}', 'There is 5 apples', array('count' => 5)),
127127
);
128128
}

‎src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use Symfony\Component\Process\ProcessBuilder;
1919

2020
/**
21-
* Runs Symfony2 application using PHP built-in web server
21+
* Runs Symfony application using PHP built-in web server.
2222
*
2323
* @author Michał Pipa <michal.pipa.xsolve@gmail.com>
2424
*/

‎src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php

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

1818
/**
1919
* FilesystemLoader extends the default Twig filesystem loader
20-
* to work with the Symfony2 paths.
20+
* to work with the Symfony paths and template references.
2121
*
2222
* @author Fabien Potencier <fabien@symfony.com>
2323
*/

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- START of Symfony2 Web Debug Toolbar -->
1+
<!-- START of Symfony Web Debug Toolbar -->
22
{% if 'normal' != position %}
33
<div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar" data-no-turbolink>
44
<a href="javascript:void(0);" title="Show Symfony toolbar" onclick="
@@ -45,4 +45,4 @@
4545
"></a>
4646
{% endif %}
4747
</div>
48-
<!-- END of Symfony2 Web Debug Toolbar -->
48+
<!-- END of Symfony Web Debug Toolbar -->

‎src/Symfony/Component/EventDispatcher/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
EventDispatcher Component
22
=========================
33

4-
The Symfony2 EventDispatcher component implements the Mediator pattern in a
4+
The Symfony EventDispatcher component implements the Mediator pattern in a
55
simple and effective way to make your projects truly extensible.
66

77
```php

‎src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testSubPath($baseDir, array $paths, array $subPaths, array $subP
3131

3232
public function getSubPathData()
3333
{
34-
$tmpDir = sys_get_temp_dir().'/symfony2_finder';
34+
$tmpDir = sys_get_temp_dir().'/symfony_finder';
3535

3636
return array(
3737
array(

‎src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ abstract class RealIteratorTestCase extends IteratorTestCase
1818

1919
public static function setUpBeforeClass()
2020
{
21-
self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony2_finder';
21+
self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony_finder';
2222

2323
self::$files = array(
2424
'.git/',
@@ -74,7 +74,7 @@ protected static function toAbsolute($files = null)
7474
* Without the call to setUpBeforeClass() property can be null.
7575
*/
7676
if (!self::$tmpDir) {
77-
self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony2_finder';
77+
self::$tmpDir = realpath(sys_get_temp_dir()).DIRECTORY_SEPARATOR.'symfony_finder';
7878
}
7979

8080
if (is_array($files)) {

‎src/Symfony/Component/Form/Extension/Csrf/CsrfProvider/SessionCsrfProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\HttpFoundation\Session\Session;
1515

1616
/**
17-
* This provider uses a Symfony2 Session object to retrieve the user's
17+
* This provider uses a Symfony Session object to retrieve the user's
1818
* session ID.
1919
*
2020
* @see DefaultCsrfProvider

‎src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Validator\Constraints\Valid;
1818

1919
/**
20-
* Extension supporting the Symfony2 Validator component in forms.
20+
* Extension supporting the Symfony Validator component in forms.
2121
*
2222
* @author Bernhard Schussek <bschussek@gmail.com>
2323
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function getHtml4Ids()
4949
array('9', true),
5050
// Contrary to the HTML4 spec, we allow names starting with an
5151
// underscore, since this is already a widely used practice in
52-
// Symfony2.
52+
// Symfony.
5353
// For root forms, leading underscores will be stripped from the
5454
// "id" attribute to produce valid HTML4.
5555
array('_', true),

‎src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler;
1616

1717
/**
18-
* Allows session to be started by PHP and managed by Symfony2
18+
* Allows session to be started by PHP and managed by Symfony
1919
*
2020
* @author Drak <drak@zikula.org>
2121
*/

‎src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function setProvider()
136136
return array(
137137
array('foo', 'bar', array('foo' => 'bar')),
138138
array('foo.bar', 'too much beer', array('foo.bar' => 'too much beer')),
139-
array('great', 'symfony2 is great', array('great' => 'symfony2 is great')),
139+
array('great', 'symfony is great', array('great' => 'symfony is great')),
140140
);
141141
}
142142

@@ -195,7 +195,7 @@ public function testGetFlashBag()
195195
*/
196196
public function testGetIterator()
197197
{
198-
$attributes = array('hello' => 'world', 'symfony2' => 'rocks');
198+
$attributes = array('hello' => 'world', 'symfony' => 'rocks');
199199
foreach ($attributes as $key => $val) {
200200
$this->session->set($key, $val);
201201
}
@@ -215,7 +215,7 @@ public function testGetIterator()
215215
public function testGetCount()
216216
{
217217
$this->session->set('hello', 'world');
218-
$this->session->set('symfony2', 'rocks');
218+
$this->session->set('symfony', 'rocks');
219219

220220
$this->assertCount(2, $this->session);
221221
}

‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function testCookieOptions()
137137
$options = array(
138138
'cookie_lifetime' => 123456,
139139
'cookie_path' => '/my/cookie/path',
140-
'cookie_domain' => 'symfony2.example.com',
140+
'cookie_domain' => 'symfony.example.com',
141141
'cookie_secure' => true,
142142
'cookie_httponly' => false,
143143
);

‎src/Symfony/Component/HttpKernel/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ HttpKernel Component
44
HttpKernel provides the building blocks to create flexible and fast HTTP-based
55
frameworks.
66

7-
``HttpKernelInterface`` is the core interface of the Symfony2 full-stack
7+
``HttpKernelInterface`` is the core interface of the Symfony full-stack
88
framework:
99

1010
```php
@@ -23,11 +23,11 @@ interface HttpKernelInterface
2323

2424
It takes a ``Request`` as an input and should return a ``Response`` as an
2525
output. Using this interface makes your code compatible with all frameworks
26-
using the Symfony2 components. And this will give you many cool features for
26+
using the Symfony components. And this will give you many cool features for
2727
free.
2828

29-
Creating a framework based on the Symfony2 components is really easy. Here is
30-
a very simple, but fully-featured framework based on the Symfony2 components:
29+
Creating a framework based on the Symfony components is really easy. Here is
30+
a very simple, but fully-featured framework based on the Symfony components:
3131

3232
```php
3333
$routes = new RouteCollection();
@@ -54,7 +54,7 @@ $kernel = new HttpKernel($dispatcher, $resolver);
5454
$kernel->handle($request)->send();
5555
```
5656

57-
This is all you need to create a flexible framework with the Symfony2
57+
This is all you need to create a flexible framework with the Symfony
5858
components.
5959

6060
Want to add an HTTP reverse proxy and benefit from HTTP caching and Edge Side

‎src/Symfony/Component/Intl/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ Once it is, the following steps have to be followed to build the .dat-file:
8888

8989
$ rm -rf build packagelist.txt
9090

91-
3. You can now move region.dat to replace the version bundled with Symfony2.
91+
3. You can now move region.dat to replace the version bundled with Symfony.

‎src/Symfony/Component/Intl/Resources/bin/update-data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
bailout(<<<MESSAGE
3939
Usage: php update-icu-component.php <path/to/icu/source> <path/to/icu/build>
4040
41-
Updates the ICU data for Symfony2 to the latest version of ICU.
41+
Updates the ICU data for Symfony to the latest version of ICU.
4242
4343
If you downloaded the SVN repository before, you can pass the path to the
4444
repository source in the first optional argument.

‎src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public function testGetLocaleReturnsDefaultLocaleIfNotSet()
7575
public function getTransTests()
7676
{
7777
return array(
78-
array('Symfony2 is great!', 'Symfony2 is great!', array()),
79-
array('Symfony2 is awesome!', 'Symfony2 is %what%!', array('%what%' => 'awesome')),
78+
array('Symfony is great!', 'Symfony is great!', array()),
79+
array('Symfony is awesome!', 'Symfony is %what%!', array('%what%' => 'awesome')),
8080
);
8181
}
8282

0 commit comments

Comments
 (0)
0