Skip to content

Commit 8e6db18

Browse files
committed
use phpcr-odm 1.4.4
1 parent 0aa406f commit 8e6db18

File tree

9 files changed

+207
-32
lines changed

9 files changed

+207
-32
lines changed

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"doctrine/data-fixtures": "^1.0",
3737
"doctrine/doctrine-bundle": "^1.6",
3838
"doctrine/doctrine-cache-bundle": "^1.2",
39-
"doctrine/phpcr-odm": "^2.0",
4039
"egeloen/ckeditor-bundle": "dev-allow_symfony_4",
4140
"egeloen/json-builder": "dev-allow_symfony_4 as 3.0",
4241
"friendsofsymfony/rest-bundle": "^2.3",
@@ -67,7 +66,9 @@
6766
"symfony/polyfill-apcu": "^1.0",
6867
"symfony/swiftmailer-bundle": "^3.2",
6968
"symfony/web-server-bundle": "^4.0",
70-
"symfony/yaml": "^4.0"
69+
"symfony/yaml": "^4.0",
70+
"sonata-project/translation-bundle": "^2.6",
71+
"sonata-project/doctrine-orm-admin-bundle": "^3.4"
7172
},
7273
"require-dev": {
7374
"liip/functional-test-bundle": "^2.0",

composer.lock

Lines changed: 182 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/bundles.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,6 @@
4040
Sonata\DatagridBundle\SonataDatagridBundle::class => ['all' => true],
4141
FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
4242
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
43+
Sonata\TranslationBundle\SonataTranslationBundle::class => ['all' => true],
44+
Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle::class => ['all' => true],
4345
];

config/packages/sonata_admin.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ sonata_doctrine_phpcr_admin:
7979
document_tree:
8080
routing_defaults: [locale]
8181

82-
#sonata_translation:
83-
# locales: '%locales%'
84-
# default_locale: '%locale%'
85-
# phpcr: true
82+
sonata_translation:
83+
locales: '%locales%'
84+
default_locale: '%locale%'
85+
phpcr: true
8686

8787
sonata_seo:
8888
page:

config/packages/test/security.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
security:
2+
firewalls:
3+
# replace 'main' by the name of your own firewall
4+
main:
5+
http_basic: ~

phpunit.xml.dist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
</testsuites>
2828

2929
<php>
30-
<server name="KERNEL_DIR" value="app/" />
31-
3230
<!-- ###+ symfony/framework-bundle ### -->
3331
<env name="APP_ENV" value="test"/>
3432
<env name="APP_SECRET" value="3780da4e3c8b2225171dc1b6ddba5599"/>

symfony.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,9 @@
245245
"sonata-project/datagrid-bundle": {
246246
"version": "2.3.1"
247247
},
248+
"sonata-project/doctrine-orm-admin-bundle": {
249+
"version": "3.4.2"
250+
},
248251
"sonata-project/doctrine-phpcr-admin-bundle": {
249252
"version": "2.x-dev"
250253
},
@@ -254,6 +257,9 @@
254257
"sonata-project/seo-bundle": {
255258
"version": "2.5.0"
256259
},
260+
"sonata-project/translation-bundle": {
261+
"version": "2.3.0"
262+
},
257263
"swiftmailer/swiftmailer": {
258264
"version": "v6.0.2"
259265
},

tests/Functional/AdminDashboardTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespace App\Tests\Functional;
1313

14+
use Symfony\Component\HttpFoundation\Cookie;
15+
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
16+
1417
class AdminDashboardTest extends WebTestCase
1518
{
1619
public function testRedirectToDashboard()

tests/Functional/WebTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public function setUp()
3737
protected function createClientAuthenticated(array $options = [], array $server = [])
3838
{
3939
$server = array_merge($server, [
40-
'PHP_AUTH_USER' => 'admin',
41-
'PHP_AUTH_PW' => 'admin',
40+
'PHP_AUTH_USER' => 'username',
41+
'PHP_AUTH_PW' => 'pa$$word',
4242
]);
4343

4444
return self::createClient($options, $server);

0 commit comments

Comments
 (0)