Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f455700

Browse files
fabpotfabpot
committed
fixed previous commit
1 parent 3ed4711 commit f455700

File tree

26 files changed

+46
-37
lines changed

26 files changed

+46
-37
lines changed

‎src/Symfony/Bundle/CompatAssetsBundle/CompatAssetsBundle.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}
38-
38+
}

‎src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getNamespace()
4343
/**
4444
* {@inheritdoc}
4545
*/
46-
protected function getPath()
46+
public function getPath()
4747
{
4848
return __DIR__;
4949
}

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/AnnotationsBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/Vendor/AnnotationsBundle/AnnotationsBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/XmlBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/Bundles/YamlBundle/YamlBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineMigrationsBundle/DoctrineMigrationsBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function getNamespace()
3232
/**
3333
* {@inheritdoc}
3434
*/
35-
protected function getPath()
35+
public function getPath()
3636
{
3737
return __DIR__;
3838
}

‎src/Symfony/Bundle/DoctrineMongoDBBundle/DoctrineMongoDBBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function getNamespace()
4747
/**
4848
* {@inheritdoc}
4949
*/
50-
protected function getPath()
50+
public function getPath()
5151
{
5252
return __DIR__;
5353
}

‎src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/AnnotationsBundle/AnnotationsBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/XmlBundle/XmlBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

‎src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/Bundles/YamlBundle/YamlBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function getNamespace()
1717
/**
1818
* {@inheritdoc}
1919
*/
20-
protected function getPath()
20+
public function getPath()
2121
{
2222
return __DIR__;
2323
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function getNamespace()
9292
/**
9393
* {@inheritdoc}
9494
*/
95-
protected function getPath()
95+
public function getPath()
9696
{
9797
return __DIR__;
9898
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TestBundle/Fabpot/FooBundle/FabpotFooBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function getNamespace()
3939
/**
4040
* {@inheritdoc}
4141
*/
42-
protected function getPath()
42+
public function getPath()
4343
{
4444
return __DIR__;
4545
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TestBundle/FooBundle/FooBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TestBundle/Sensio/Cms/FooBundle/SensioCmsFooBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/TestBundle/Sensio/FooBundle/SensioFooBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}

‎src/Symfony/Bundle/SecurityBundle/SecurityBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getNamespace()
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
protected function getPath()
45+
public function getPath()
4646
{
4747
return __DIR__;
4848
}

‎src/Symfony/Bundle/SwiftmailerBundle/SwiftmailerBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getNamespace()
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
protected function getPath()
43+
public function getPath()
4444
{
4545
return __DIR__;
4646
}

‎src/Symfony/Bundle/WebProfilerBundle/WebProfilerBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getNamespace()
3131
/**
3232
* {@inheritdoc}
3333
*/
34-
protected function getPath()
34+
public function getPath()
3535
{
3636
return __DIR__;
3737
}

‎src/Symfony/Bundle/ZendBundle/ZendBundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function getNamespace()
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
protected function getPath()
43+
public function getPath()
4444
{
4545
return __DIR__;
4646
}

‎src/Symfony/Component/HttpKernel/Bundle/Bundle.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,33 @@ abstract class Bundle extends ContainerAware implements BundleInterface
2727
protected $name;
2828

2929
/**
30-
* {@inheritDoc}
30+
* Boots the Bundle.
3131
*/
3232
public function boot()
3333
{
3434
}
3535

3636
/**
37-
* {@inheritDoc}
37+
* Shutdowns the Bundle.
3838
*/
3939
public function shutdown()
4040
{
4141
}
4242

4343
/**
44-
* {@inheritDoc}
44+
* Returns the bundle parent name.
45+
*
46+
* @return string The Bundle parent name it overrides or null if no parent
4547
*/
4648
public function getParent()
4749
{
4850
return null;
4951
}
5052

5153
/**
52-
* {@inheritDoc}
54+
* Returns the bundle name (the class short name).
55+
*
56+
* @return string The Bundle name
5357
*/
5458
final public function getName()
5559
{
@@ -64,7 +68,11 @@ final public function getName()
6468
}
6569

6670
/**
67-
* {@inheritDoc}
71+
* Gets the Bundle directory path.
72+
*
73+
* The path should always be returned as a Unix path (with /).
74+
*
75+
* @return string The Bundle absolute path
6876
*/
6977
final public function getNormalizedPath()
7078
{
@@ -125,11 +133,4 @@ public function registerCommands(Application $application)
125133
}
126134
}
127135
}
128-
129-
/**
130-
* Gets the Bundle directory path.
131-
*
132-
* @return string The Bundle absolute path
133-
*/
134-
abstract protected function getPath();
135136
}

‎src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ function getName();
4949
*/
5050
function getNamespace();
5151

52+
53+
/**
54+
* Gets the Bundle directory path.
55+
*
56+
* @return string The Bundle absolute path
57+
*/
58+
function getPath();
59+
5260
/**
5361
* Gets the Bundle directory path.
5462
*

‎src/Symfony/Component/HttpKernel/HttpCache/Store.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ protected function save($key, $data)
336336
chmod($path, 0644);
337337
}
338338

339-
protected function getPath($key)
339+
public function getPath($key)
340340
{
341341
return $this->root.DIRECTORY_SEPARATOR.substr($key, 0, 2).DIRECTORY_SEPARATOR.substr($key, 2, 2).DIRECTORY_SEPARATOR.substr($key, 4, 2).DIRECTORY_SEPARATOR.substr($key, 6);
342342
}

‎src/Symfony/Component/HttpKernel/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ function shutdown();
228228
function getParent();
229229
function getName();
230230
function getNamespace();
231+
function getPath();
231232
function getNormalizedPath();
232233
}
233234
}
@@ -291,7 +292,6 @@ public function registerCommands(Application $application)
291292
}
292293
}
293294
}
294-
abstract protected function getPath();
295295
}
296296
}
297297
namespace Symfony\Component\HttpKernel\Debug

‎src/Symfony/Component/HttpKernel/bootstrap_cache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ protected function save($key, $data)
887887
}
888888
chmod($path, 0644);
889889
}
890-
protected function getPath($key)
890+
public function getPath($key)
891891
{
892892
return $this->root.DIRECTORY_SEPARATOR.substr($key, 0, 2).DIRECTORY_SEPARATOR.substr($key, 2, 2).DIRECTORY_SEPARATOR.substr($key, 4, 2).DIRECTORY_SEPARATOR.substr($key, 6);
893893
}

0 commit comments

Comments
 (0)