Skip to content

Commit cd33a86

Browse files
committed
Merge pull request #121 from symfony-cmf/undeprecate_resources
Undeprecate resources
2 parents 420f1f9 + 95af22c commit cd33a86

File tree

6 files changed

+0
-12
lines changed

6 files changed

+0
-12
lines changed

resources/config/default.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$kernelRootDir = $container->getParameter('kernel.root_dir');
1513
$bundleName = null;
1614

resources/config/dist/framework.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/dist/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$config = array(
1513
'secret' => 'test',
1614
'test' => null,

resources/config/dist/phpcr_odm.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/dist/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$config = array(
1513
'session' => array(
1614
'backend' => '%phpcr_backend%',

resources/config/doctrine_orm.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$loader->import(CMF_TEST_CONFIG_DIR.'/dist/doctrine_orm.yml');

resources/config/phpcr_odm.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$loader->import(CMF_TEST_CONFIG_DIR.'/dist/phpcr_odm.php');

resources/config/sonata_admin.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,4 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
@trigger_error('The resources/config/'.basename(__FILE__).' file is deprecated since version 1.3 and will be removed in 2.0. Include the config file in your own library instead.');
13-
1412
$loader->import(CMF_TEST_CONFIG_DIR.'/dist/sonata_admin.yml');

0 commit comments

Comments
 (0)