8000 merged branch willdurand/filesystem-component (PR #2949) · mshtukin/symfony@b498138 · GitHub
[go: up one dir, main page]
Skip to content

Commit b498138

Browse files
fabpotfabpot
committed
merged branch willdurand/filesystem-component (PR symfony#2949)
Commits ------- 4afc6ac Updated CHANGELOG-2.1 3d3239c Added Filesystem Component mention in composer.json 5775a0a Added composer.json b26ae4a Added README fbe9507 Added LICENSE 818a332 [Component] Moved Filesystem class to its own component Discussion ---------- Filesystem component Related to symfony#2946 William --------------------------------------------------------------------------- by stof at 2011/12/22 10:58:25 -0800 you need to add the new component in the ``replace`` section of the main composer.json, and you also need to add it as a dependency for FrameworkBundle as it defines a service using it. --------------------------------------------------------------------------- by stof at 2011/12/22 10:59:34 -0800 and you need to update the changelog file --------------------------------------------------------------------------- by willdurand at 2011/12/22 11:06:04 -0800 @stof thanks. Is it ok ? --------------------------------------------------------------------------- by stof at 2011/12/22 11:13:31 -0800 mentioning the move only once in the changelog would probably be enough (and it is especially not needed in the FrameworkBundle section IMO) but otherwise it's fine
2 parents d149aa7 + 4afc6ac commit b498138

File tree

13 files changed

+89
-7
lines changed

13 files changed

+89
-7
lines changed

‎CHANGELOG-2.1.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
3333
* [BC BREAK] assets_base_urls and base_urls merging strategy has changed
3434
* changed the default profiler storage to use the filesystem instead of SQLite
3535
* added support for placeholders in route defaults and requirements (replaced by the value set in the service container)
36+
* added Filesystem component as a dependency
3637

3738
### SecurityBundle
3839

@@ -128,6 +129,10 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
128129
* added a reference to the EventDispatcher on the Event
129130
* added a reference to the Event name on the event
130131

132+
### Filesystem
133+
134+
* created this new component
135+
131136
### Finder
132137

133138
* Finder::exclude() now supports an array of directories as an argument
@@ -160,6 +165,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
160165
* improved extensibility between bundles
161166
* added a File-based profiler storage
162167
* added a MongoDB-based profiler storage
168+
* moved Filesystem class to its own component
163169

164170
### Locale
165171

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"symfony/dependency-injection": "self.version",
4444
"symfony/dom-crawler": "self.version",
4545
"symfony/event-dispatcher": "self.version",
46+
"symfony/filesystem": "self.version",
4647
"symfony/finder": "self.version",
4748
"symfony/form": "self.version",
4849
"symfony/http-foundation": "self.version",

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parameters>
88
<parameter key="event_dispatcher.class">Symfony\Bundle\FrameworkBundle\ContainerAwareEventDispatcher</parameter>
99
<parameter key="http_kernel.class">Symfony\Bundle\FrameworkBundle\HttpKernel</parameter>
10-
<parameter key="filesystem.class">Symfony\Component\HttpKernel\Util\Filesystem</parameter>
10+
<parameter key="filesystem.class">Symfony\Component\Filesystem\Filesystem</parameter>
1111
<parameter key="cache_warmer.class">Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate</parameter>
1212
<parameter key="cache_clearer.class">Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer</parameter>
1313
<parameter key="file_locator.class">Symfony\Component\HttpKernel\Config\FileLocator</parameter>

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
1313

14-
use Symfony\Component\HttpKernel\Util\Filesystem;
1514
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
15+
use Symfony\Component\Filesystem\Filesystem;
1616
use Symfony\Component\HttpKernel\Kernel;
1717

1818
class WebTestCase extends BaseWebTestCase

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
$dir = dirname($dir);
3131
}
3232

33-
use Symfony\Component\HttpKernel\Util\Filesystem;
3433
use Symfony\Component\Config\Loader\LoaderInterface;
34+
use Symfony\Component\Filesystem\Filesystem;
3535
use Symfony\Component\HttpKernel\Kernel;
3636

3737
/**

‎src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php

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

1414
use Symfony\Bundle\FrameworkBundle\Translation\Translator;
1515
use Symfony\Component\Translation\MessageCatalogue;
16-
use Symfony\Component\HttpKernel\Util\Filesystem;
16+
use Symfony\Component\Filesystem\Filesystem;
1717
use Symfony\Component\Translation\MessageSelector;
1818

1919
class TranslatorTest extends \PHPUnit_Framework_TestCase
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"php": ">=5.3.2",
2121
"symfony/event-dispatcher": "self.version",
2222
"symfony/http-kernel": "self.version",
23+
"symfony/filesystem": "self.version",
2324
"symfony/routing": "self.version",
2425
"symfony/templating": "self.version",
2526
"symfony/translator": "self.version",

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/WebTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
1313

14-
use Symfony\Component\HttpKernel\Util\Filesystem;
1514
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase as BaseWebTestCase;
15+
use Symfony\Component\Filesystem\Filesystem;
1616
use Symfony\Component\HttpKernel\Kernel;
1717

1818
class WebTestCase extends BaseWebTestCase

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/AppKernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
$dir = dirname($dir);
3131
}
3232

33-
use Symfony\Component\HttpKernel\Util\Filesystem;
3433
use Symfony\Component\Config\Loader\LoaderInterface;
34+
use Symfony\Component\Filesystem\Filesystem;
3535
use Symfony\Component\HttpKernel\Kernel;
3636

3737
/**

‎src/Symfony/Component/HttpKernel/Util/Filesystem.php renamed to ‎src/Symfony/Component/Filesystem/Filesystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\HttpKernel\Util;
12+
namespace Symfony\Component\Filesystem;
1313

1414
/**
1515
* Provides basic utility to manipulate the file system.

0 commit comments

Comments
 (0)
0