Skip to content

Commit f6a13c5

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Fix license headers Ensure the ClockMock is loaded before using it in the testsuite Fix with_minutes option in time widget Fixed properties not explicitily declared
2 parents cd382a6 + afe2b38 commit f6a13c5

File tree

3 files changed

+27
-0
lines changed

3 files changed

+27
-0
lines changed

Tests/Functional/SetAclCommandTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
413

514
/*

Tests/Functional/app/Acl/bundles.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
return array(
413
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
514
new Symfony\Bundle\SecurityBundle\SecurityBundle(),

Tests/Functional/app/PasswordEncode/bundles.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
return array(
413
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
514
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),

0 commit comments

Comments
 (0)