Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Go into SF 4 #403

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
34d200a
Prepare next version with all SF 4 changes
ElectricMaxxx Feb 23, 2018
b9bff0e
Apply fixes from StyleCI
dbu Aug 28, 2018
661f85e
Merge pull request #407 from symfony-cmf/analysis-qx3wJ0
dbu Aug 28, 2018
ad35cbb
current state
ElectricMaxxx Oct 1, 2018
80dc15b
get it working again
ElectricMaxxx Jan 21, 2019
c0696b7
get ckEditor running with dev branch of our sonata admin
ElectricMaxxx Jan 21, 2019
bfb3dd3
push with new version
ElectricMaxxx Mar 3, 2019
c6b41af
fix most dependencies on patch changes only. So cmf is mostly on 2.1.…
ElectricMaxxx Mar 4, 2019
f3db638
move translation config to dev config
ElectricMaxxx Mar 4, 2019
0e12546
fix env setting
ElectricMaxxx Mar 4, 2019
ffad034
fix env setting
ElectricMaxxx Mar 4, 2019
e617766
avoid using dev version
ElectricMaxxx Mar 4, 2019
e83f4b6
fix fixture loader test
ElectricMaxxx Mar 4, 2019
2d83432
add makefile and travis scripts
ElectricMaxxx Mar 4, 2019
675f09c
remove forreign repository
ElectricMaxxx Mar 4, 2019
5e5e3b4
explicit phpunit version
ElectricMaxxx Mar 4, 2019
1aae94d
apply cs fixes
ElectricMaxxx Mar 4, 2019
38002fc
use 2.0 version of functional test bundle only
ElectricMaxxx Mar 4, 2019
44f04d2
use latest stable functional-test-bundle version
ElectricMaxxx Mar 4, 2019
f89c9c1
first try without liip/functional-test-bundle
ElectricMaxxx Mar 5, 2019
57133a6
add test-pack
ElectricMaxxx Mar 5, 2019
3288fc4
cs fixes
ElectricMaxxx Mar 5, 2019
602d603
try to use it with testing component`s bootstrap
ElectricMaxxx Mar 5, 2019
33388be
move to non dev
ElectricMaxxx Mar 5, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
9 changes: 9 additions & 0 deletions public/index.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

use App\Kernel;
use Symfony\Component\Debug\Debug;
use Symfony\Component\Dotenv\Dotenv;
2 changes: 1 addition & 1 deletion public/reload-fixtures.php
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ function outputNice($output)
}
}

$commandFile = __DIR__ . '/../bin/reloadFixtures.sh';
$commandFile = __DIR__.'/../bin/reloadFixtures.sh';
if (!file_exists($commandFile)) {
outputNice('File not found at: '.$commandFile);
}
2 changes: 1 addition & 1 deletion src/DataFixtures/PHPCR/LoadStaticPageData.php
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ public function load(ObjectManager $manager)
$yaml = new Parser();
$data = $yaml->parse(
file_get_contents(
__DIR__ . '/../../Resources/data/page.yml'
__DIR__.'/../../Resources/data/page.yml'
)
);

9 changes: 9 additions & 0 deletions src/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php

/*
* This file is part of the Symfony CMF package.
*
* (c) Symfony CMF
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace App;

use App\DependencyInjection\Compiler\DocumentClassPass;
3 changes: 0 additions & 3 deletions tests/Functional/AdminDashboardTest.php
Original file line number Diff line number Diff line change
@@ -11,9 +11,6 @@

namespace App\Tests\Functional;

use Symfony\Component\HttpFoundation\Cookie;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;

class AdminDashboardTest extends WebTestCase
{
public function testRedirectToDashboard()