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

Towards sym3 #1214

Open
wants to merge 140 commits into
base: symfony_28_to_30
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
0199c0e
calcoen eclipse files
Apr 3, 2021
3ff4e37
calcoen - custom fields - Part table
Apr 3, 2021
72221a7
fix barcode action not shown
Apr 3, 2021
d320b78
fix action delete button no handler issue partkeepr#1202
Apr 3, 2021
fe0c3af
Revert max value limitation. Negative stock values are allowed/expected
Apr 3, 2021
ede82d5
update replaceFromURL's user-agent to avoid TI ban #1165
Apr 3, 2021
246fc11
Show errors from Octopart search
Apr 3, 2021
1f0dc34
comment out github workflow
Apr 4, 2021
13e8568
add the v to some number to have the exact tag
Apr 23, 2021
e98af5c
modified by composer
Apr 23, 2021
ad202d5
dunglas/api-bundle use new name api-platform/core
Apr 25, 2021
396c61c
missing AppClassLoader in dev
Apr 30, 2021
5271af0
PK in working state
May 2, 2021
57ff56e
nelmio/api-doc-bundle to 2.10.0
May 2, 2021
0ce010a
nelmio/api-doc-bundle to 2.10.3
May 3, 2021
f0d38d0
nelmio/api-doc-bundle to 2.13.5
May 3, 2021
5fc27d7
EscapeWSSEAuthenticationBundle to v2.3.0 and back to original repository
May 9, 2021
640fc48
fr3d/ldap-bundle back to original git + v3.0.0 custom enabled removed
May 9, 2021
072b62b
fr3d/ldap-bundle to v3.0.2
May 9, 2021
15d38e2
update fr3d/ldap-bundle in the repository section of composer
ghost-from-the-past May 10, 2021
5fa865d
update EscapeWSSEAuthenticationBundle in the repository section of
ghost-from-the-past May 10, 2021
107bb18
eclipe prj renamed
ghost-from-the-past May 10, 2021
4f3381e
dunglas client_can_change upgrade
ghost-from-the-past May 10, 2021
4d57922
BREAK - go for api_platform v2
ghost-from-the-past May 11, 2021
2b08b29
phase 1 api resource migrate to annotation
ghost-from-the-past May 11, 2021
1dc73cc
phase 2 api_platform differences
ghost-from-the-past May 11, 2021
90dcb07
fos_rest, scope, gives error, deprecated ?
ghost-from-the-past May 11, 2021
6e5ca1e
negotiator class changed - to be checked
ghost-from-the-past May 11, 2021
be80c84
no idea when/how I changed this - check.php
ghost-from-the-past May 11, 2021
26c8847
phase 3 - operation to annotation - BatchJob
ghost-from-the-past May 11, 2021
ab327c1
phase 3 - operation to annotation - FootprintImage (i guess is wrong)
ghost-from-the-past May 12, 2021
6e5b3f4
added hydra
ghost-from-the-past May 12, 2021
9ea85f1
revert part of the changes of FootprintImage
ghost-from-the-past May 12, 2021
8f21599
phase 3 - operation to annotation - FootprintAttachment
ghost-from-the-past May 12, 2021
e9252c4
correct to custom_get_mime
ghost-from-the-past May 12, 2021
e1c7d2e
cosmetics
ghost-from-the-past May 12, 2021
da953c5
phase 3 - operation to annotation - FootprintCategory
ghost-from-the-past May 12, 2021
fa2b679
phase 3 - operation to annotation - GridPreset
ghost-from-the-past May 12, 2021
f9891d7
phase 3 - operation to annotation - Part
ghost-from-the-past May 12, 2021
a848469
phase 3 - operation to annotation - PartAttachment
ghost-from-the-past May 13, 2021
91f8cba
PartAttachment forgotten end of comment - clean
ghost-from-the-past May 13, 2021
b6dc642
phase 3 - operation to annotation - PartCategory
ghost-from-the-past May 13, 2021
e88ff66
phase 3 - operation to annotation - ManufacturerICLogo
ghost-from-the-past May 13, 2021
39caf6d
phase 3 - operation to annotation - PartMeasurement-unit
ghost-from-the-past May 13, 2021
2b3e35e
phase 3 - operation to annotation - StorageLocationCategory
ghost-from-the-past May 13, 2021
24a2d7d
copy-paste error, is collection operation PartCategory
ghost-from-the-past May 13, 2021
630bc66
copy-paste error, is collection operation Part
ghost-from-the-past May 13, 2021
c4abe9b
copy-paste error, is collection operation FoorprintCategory
ghost-from-the-past May 13, 2021
934bf51
phase 3 - operation to annotation - StorageLocationImage
ghost-from-the-past May 13, 2021
ded2ad5
phase 3 - operation to annotation - TempImage
ghost-from-the-past May 13, 2021
330f14c
phase 3 - operation to annotation - TempUploadedFile
ghost-from-the-past May 13, 2021
61a145c
phase 3 - operation to annotation - TipOfTheDay
ghost-from-the-past May 13, 2021
755c67f
phase 3 - operation to annotation - TipOfTheDayHistory
ghost-from-the-past May 13, 2021
3f4cad8
phase 3 - operation to annotation - User
ghost-from-the-past May 13, 2021
7b88462
phase 3 - operation to annotation - Report
ghost-from-the-past May 13, 2021
93c2d00
phase 3 - operation to annotation - ProjectAttachment
ghost-from-the-past May 13, 2021
60e3554
phase 3 - operation to annotation - SystemNotice
ghost-from-the-past May 13, 2021
2c32962
phase 3 - operation to annotation - SystemPreference
ghost-from-the-past May 13, 2021
0db54ca
phase 4 - place Route - SystemPreference
ghost-from-the-past May 13, 2021
341dd6f
phase 4 - place Route - SystemNotice
ghost-from-the-past May 13, 2021
43af33f
phase 4 - place Route - User
ghost-from-the-past May 13, 2021
62b1e39
phase 4 - place Route - TipOfTheDayHistory
ghost-from-the-past May 13, 2021
6f13624
phase 4 - place Route - TipOfTheDay
ghost-from-the-past May 13, 2021
4c07b64
phase 4 - place Route - User (getProvider)
ghost-from-the-past May 13, 2021
f1640eb
phase 4 - place Route - ProjectAttachment
ghost-from-the-past May 13, 2021
3e6a2fb
phase 4 - place Route - Report
ghost-from-the-past May 13, 2021
3ada58f
phase 4 - place Route - TempUploadFile
ghost-from-the-past May 13, 2021
7439cc7
phase 4 - place Route - TempImage
ghost-from-the-past May 13, 2021
71df159
phase 4 - place Route - StorageLocationImage
ghost-from-the-past May 13, 2021
35820a2
phase 4 - place Route - StorageLocationCategory
ghost-from-the-past May 13, 2021
610a332
phase 4 - place Route - FoorptintCategory
ghost-from-the-past May 13, 2021
e30a742
phase 4 - place Route - PartCategory
ghost-from-the-past May 13, 2021
aae2567
phase 4 - place Route - Part
ghost-from-the-past May 13, 2021
000904a
phase 4 - place Route - PartMeasurementUnit
ghost-from-the-past May 13, 2021
2b94205
phase 4 - place Route - ManufacturerICLogo
ghost-from-the-past May 13, 2021
f0583ff
phase 4 - place Route - PartAttachment
ghost-from-the-past May 13, 2021
8a0f253
phase 4 - place Route - GridPreset
ghost-from-the-past May 13, 2021
1b712b2
phase 4 - place Route - FootprintAttachment
ghost-from-the-past May 13, 2021
252576c
phase 4 - place Route - FootprintImage
ghost-from-the-past May 13, 2021
ff8cf15
phase 4 - place Route - BatchJob
ghost-from-the-past May 13, 2021
112dc51
fix some path errors in composer json lock
ghost-from-the-past May 13, 2021
ab4a1fc
composer, updated some Symfonys to 3.4.x -lock is not manual! this time
ghost-from-the-past May 13, 2021
411061f
patter -> path for Symf 3, is this a case ?
ghost-from-the-past May 14, 2021
fc64b9e
symf 3 added strict_email in validation
ghost-from-the-past May 14, 2021
3dc10a5
symf 3 added api in validation
ghost-from-the-past May 14, 2021
0e44895
symf 3 - new DebugBundle, as recommended
ghost-from-the-past May 14, 2021
7161e1c
relax php version in composer json lock
ghost-from-the-past May 14, 2021
8da6e34
revert syntax still not recognized
ghost-from-the-past May 14, 2021
93ef2b3
working with cache configs ...
ghost-from-the-past May 14, 2021
7911fa7
following the standar for AppKernel
ghost-from-the-past May 14, 2021
b653499
comment out AsseticBundle
ghost-from-the-past May 14, 2021
23e6f26
autoload.php and bootstrap.php.cache removed
ghost-from-the-past May 14, 2021
bf3c779
following the composer.json standard symf 3 - mostly the scripts
ghost-from-the-past May 14, 2021
a4bc54a
console moved from app to bin and following the standard
ghost-from-the-past May 14, 2021
15f4e11
console in bin
ghost-from-the-past May 14, 2021
5ef42ea
tests moved from src to tests directory and namespace modified
ghost-from-the-past May 14, 2021
e1e3cf9
app/bootstrap.php.cache to var/bootstrap.php.cache
ghost-from-the-past May 14, 2021
5c755f9
SymfonyRequirements.php moved from /app to /var
ghost-from-the-past May 14, 2021
7a2a6d7
phpunit.xml.dist moved from /app to /
ghost-from-the-past May 14, 2021
9d79400
update gitignore
ghost-from-the-past May 14, 2021
dd75dba
bootstrap vendor/autload
ghost-from-the-past May 14, 2021
e61b0d3
dummy parameters.yml.dist required by incenteev-parameters
ghost-from-the-past May 14, 2021
bf822e7
AsseticBundle() and AppBundle\AppBundle() comments in AppKernel
ghost-from-the-past May 14, 2021
33390bb
duplicated line removed in composer.json
ghost-from-the-past May 14, 2021
94ef027
composer php version when was reverter back ? fixed again
ghost-from-the-past May 14, 2021
0996a11
blindly rename Dunglas\ApiBundle to ApiPlatform\Core
ghost-from-the-past May 15, 2021
e026c72
renamed api.iri_converter to api_platform.iri_converter
ghost-from-the-past May 15, 2021
566db06
FOS\RestBundle ParamFetcher service changes ?
ghost-from-the-past May 15, 2021
9ac2e81
correct api. to api_platform.
ghost-from-the-past May 15, 2021
bab9368
remove fr3d/ldap-bundle (with
ghost-from-the-past May 15, 2021
f36dedd
fr3d ldap parameters removed
ghost-from-the-past May 15, 2021
90465d7
force Ocramius/ProxyManager 2.6.1 which uses laminas/laminas-code to
ghost-from-the-past May 15, 2021
9f23b70
doctrine/orm to v2.6.6 and composer install runs with NO errors again!!!
ghost-from-the-past May 15, 2021
3db087d
restore Sensio GeneratorBundle in AppKernel
ghost-from-the-past May 15, 2021
b4e0856
remove duplicate use Assert
ghost-from-the-past May 15, 2021
6cedf5c
fix extra }
ghost-from-the-past May 15, 2021
05689f0
replacement of ActionUtilTrait by
ghost-from-the-past May 15, 2021
8888ee5
fix Route annotations
ghost-from-the-past May 15, 2021
031f140
change php version check of setup to <7.5
ghost-from-the-past May 15, 2021
d3349b6
parameters.php (temporarely pushed, to be removed later)
ghost-from-the-past May 15, 2021
f73b218
restore pk github workflow files
ghost-from-the-past May 15, 2021
9e952e0
eclipse project renamed with capital P to follow the repo
ghost-from-the-past May 15, 2021
2aa0a83
just correct the message to be coherent 7.4
ghost-from-the-past May 15, 2021
5d31e17
SymfonyRequirements is now in var dirrectory
ghost-from-the-past May 15, 2021
bfc97dc
the cache is now in var directory
ghost-from-the-past May 15, 2021
67f4c12
bootstrap.php.cache is now in var directory
ghost-from-the-past May 15, 2021
5b82809
change boostrap by autoload for load kernel at setup test
ghost-from-the-past May 15, 2021
072679a
some missing app/logs changed to app/logs
ghost-from-the-past May 16, 2021
82a90f8
move from geRootDir to getProjectDir as recommended
ghost-from-the-past May 16, 2021
11ac495
something is still looking for SymfonyRequirements.php in /app ...
ghost-from-the-past May 16, 2021
ee862fa
comment out require AppKernel when load SetupAppKernel
ghost-from-the-past May 16, 2021
9814534
seems that I didn't add it correctly SymfonyRequirements.php
ghost-from-the-past May 16, 2021
c30ebb4
message of future deprecation of KERNEL_DIR
ghost-from-the-past May 16, 2021
922f3ba
WARNING temporary comment for debugging - FormatNegotiator
ghost-from-the-past May 16, 2021
fb7f5b3
WARNING temporary comment for debugging - FormatNegotiator
ghost-from-the-past May 16, 2021
b00e13b
adjusting the boot of the kernel
ghost-from-the-past May 16, 2021
0e278e7
snc/redis-bundle to 3.2.4
ghost-from-the-past May 16, 2021
b783d2e
snc/redis-bundle removed, was not in use anyway
ghost-from-the-past May 16, 2021
6f5dc8f
ApiPlatform\Core\Model\DataProviderInterface replaced by
ghost-from-the-past May 16, 2021
ef36f95
ApiPlatform\Core\Model\DataProviderInterface replaced by
ghost-from-the-past May 16, 2021
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
619 changes: 619 additions & 0 deletions .buildpath

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions .dbeaver/.credentials-config.json.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
��H|����kt씉�XC��w�$�$���'c#�H��+�ɕ]�D P,��X���<~W�G8��BL���2Sp�=��{�w F�U�����O���A1�5����@e�iY��묖����ۮH�m
յ?���2����!�E�qL�Ej�������� $��3/������H'9�*�rQ�p]J���;�~no+��$�,T��!�����950�t#�����b�n'%�C�IM��9:���}�
Expand Down
61 changes: 61 additions & 0 deletions .dbeaver/.data-sources.json.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"folders": {},
"connections": {
"mysql8-177f1df173f-2ff7634518f3a52d": {
"provider": "mysql",
"driver": "mysql8",
"name": "localhost",
"save-password": true,
"read-only": false,
"configuration": {
"host": "localhost",
"port": "3306",
"url": "jdbc:mysql://localhost:3306/",
"type": "dev",
"auth-model": "native",
"handlers": {}
}
},
"mysql8-177f1e0b513-747f1c1518866031": {
"provider": "mysql",
"driver": "mysql8",
"name": "localhost 2",
"save-password": true,
"read-only": false,
"configuration": {
"host": "localhost",
"port": "3306",
"url": "jdbc:mysql://localhost:3306/",
"type": "dev",
"auth-model": "native",
"handlers": {}
}
},
"mysql8-177f1e12c0e-6e8b2b03ff11ca68": {
"provider": "mysql",
"driver": "mysql8",
"name": "localhost 3",
"save-password": true,
"read-only": false,
"configuration": {
"host": "localhost",
"port": "3306",
"url": "jdbc:mysql://localhost:3306/",
"home": "/usr/bin",
"type": "dev",
"auth-model": "native",
"handlers": {}
}
}
},
"connection-types": {
"dev": {
"name": "Development",
"color": "255,255,255",
"description": "Regular development database",
"auto-commit": true,
"confirm-execute": false,
"confirm-data-change": false
}
}
}
1 change: 1 addition & 0 deletions .dbeaver/credentials-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
&�l2�ͻ�oS�FA��[���礑�o9c�`��Q��o�;��ЎQx�m�7�������$� �F��U$���e%xY5dh]ls�7|�\+�P� �
29 changes: 29 additions & 0 deletions .dbeaver/data-sources.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"folders": {},
"connections": {
"mysql8-177f1df173f-2ff7634518f3a52d": {
"provider": "mysql",
"driver": "mysql8",
"name": "localhost",
"save-password": true,
"read-only": false,
"configuration": {
"host": "localhost",
"port": "3306",
"url": "jdbc:mysql://localhost:3306/",
"type": "dev",
"auth-model": "native"
}
}
},
"connection-types": {
"dev": {
"name": "Development",
"color": "255,255,255",
"description": "Regular development database",
"auto-commit": true,
"confirm-execute": false,
"confirm-data-change": false
}
}
}
1,896 changes: 1,843 additions & 53 deletions .github/workflows/docker.yml

Large diffs are not rendered by default.

1,799 changes: 1,764 additions & 35 deletions .github/workflows/notify_irc.yml

Large diffs are not rendered by default.

47 changes: 32 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
/build
/.web-server-pid
/app/config/parameters.yml
/app/authkey.php

# temporarely enabled for development
# /app/config/parameters.php
# /app/config/parameters_setup.php

/app/cache/*
/app/config/parameters.yml
/app/logs/*
/build/
/phpunit.xml
/var/*
!/var/cache
/var/cache/*
!var/cache/.gitkeep
!/var/logs
/var/logs/*
!var/logs/.gitkeep
!/var/sessions
/var/sessions/*
!var/sessions/.gitkeep
!var/SymfonyRequirements.php
/vendor/
/web/bundles/
/web/images/*
/web/spritesheets/*
/web/atelierspierrot/*
/web/js/*
/web/css/*

/setup
/frontend
/data/files/FootprintAttachment/*
Expand All @@ -22,21 +53,7 @@ theme/sass/.sass-cache/
/reports
/nbproject/
partkeepr.jsfiles
app/authkey.php
app/config/parameters.php
app/config/parameters_setup.php

/web/bundles/
/web/images/*
/web/spritesheets/*
/web/atelierspierrot/*
/web/js/*
/web/css/*
/app/bootstrap.php.cache
/app/cache/*
/app/config/parameters.yml
/app/logs/*
/vendor/
/bin/
/composer.phar

Expand Down
46 changes: 46 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Partkeepr</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.dubture.doctrine.core.doctrineBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.dubture.symfony.core.symfonyBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.php.composer.core.builder.buildPathManagementBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.dltk.core.scriptbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.jkiss.dbeaver.DBeaverNature</nature>
<nature>org.eclipse.php.core.PHPNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>com.dubture.symfony.core.symfonyNature</nature>
<nature>com.dubture.doctrine.core.doctrineNature</nature>
</natures>
</projectDescription>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.php.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
include_path=0;/PartKeepr
9 changes: 9 additions & 0 deletions .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="php.component"/>
<fixed facet="php.core.component"/>
<installed facet="php.core.component" version="1"/>
<installed facet="php.component" version="7.4"/>
<installed facet="php.composer.component" version="1"/>
<installed facet="php.symfony.component" version="2.2"/>
</faceted-project>
2 changes: 2 additions & 0 deletions .settings/org.eclipse.wst.validation.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
disabled=06vendor
eclipse.preferences.version=1
31 changes: 20 additions & 11 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;

class AppKernel extends Kernel
{
Expand All @@ -13,30 +13,32 @@ public function registerBundles()
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new FOS\RestBundle\FOSRestBundle(),
new FOS\UserBundle\FOSUserBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
new PartKeepr\DoctrineReflectionBundle\PartKeeprDoctrineReflectionBundle(),
new PartKeepr\RESTBundle\PartKeeprRESTBundle(),
new Escape\WSSEAuthenticationBundle\EscapeWSSEAuthenticationBundle(),
new SpriteGenerator\SpriteGeneratorBundle(),
new Dunglas\ApiBundle\DunglasApiBundle(),
new ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(),
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new \PartKeepr\RemoteFileLoader\PartKeeprRemoteFileLoaderBundle(),
new \FR3D\LdapBundle\FR3DLdapBundle(),
new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(),
// new AppBundle\AppBundle(),
];

// Developer bundles
if (in_array($this->getEnvironment(), ['dev', 'test'])) {
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle();
}

Expand Down Expand Up @@ -67,7 +69,7 @@ public function registerBundles()
$bundles[] = new PartKeepr\BatchJobBundle\PartKeeprBatchJobBundle();
$bundles[] = new PartKeepr\OctoPartBundle\PartKeeprOctoPartBundle();
$bundles[] = new PartKeepr\MobileFrontendBundle\PartKeeprMobileFrontendBundle();

return array_merge($bundles, $this->getCustomBundles());
}

Expand All @@ -79,10 +81,10 @@ public function registerBundles()
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
$loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');

if ($this->getEnvironment() !== 'test') {
$customConfig = __DIR__.'/config/config_custom.yml';
$customConfig = $this->getProjectDir().'/app/config/config_custom.yml';

if (file_exists($customConfig)) {
$loader->load($customConfig);
Expand Down Expand Up @@ -115,8 +117,15 @@ public function getCacheDir()
}

return $this->rootDir.'/cache/'.$environment;
// return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
}


public function getLogDir()
{
return dirname(__DIR__).'/var/logs';
}


/**
* Override to avoid stripping comments.
*
Expand Down
42 changes: 38 additions & 4 deletions app/SetupAppKernel.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\Config\Loader\LoaderInterface;

/**
* This is a special stripped-down kernel which is used during setup.
*/

class SetupAppKernel extends Kernel
{
public function registerBundles()
Expand All @@ -16,15 +17,31 @@ public function registerBundles()
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
// new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
// new Symfony\Bundle\AsseticBundle\AsseticBundle(),
// new FOS\RestBundle\FOSRestBundle(),
// new FOS\UserBundle\FOSUserBundle(),
// new \Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
// new PartKeepr\DoctrineReflectionBundle\PartKeeprDoctrineReflectionBundle(),
// new PartKeepr\RESTBundle\PartKeeprRESTBundle(),
// new Escape\WSSEAuthenticationBundle\EscapeWSSEAuthenticationBundle(),
// new SpriteGenerator\SpriteGeneratorBundle(),
// new ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
// new Brainbits\FugueIconsBundle\BrainbitsFugueIconsBundle(),
// new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
// new \PartKeepr\RemoteFileLoader\PartKeeprRemoteFileLoaderBundle(),
// new Knp\Bundle\GaufretteBundle\KnpGaufretteBundle(),
];

// Developer bundles
if (in_array($this->getEnvironment(), ['dev', 'test'])) {
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
// $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
// $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
$bundles[] = new Liip\FunctionalTestBundle\LiipFunctionalTestBundle();
}

Expand All @@ -33,8 +50,25 @@ public function registerBundles()
return $bundles;
}

/**
* Loads the configuration for an environment. Also loads a custom configuration for non-text environments from
* app/config_config_custom.yml if it exists.
*
* @param $loader LoaderInterface
*/
public function registerContainerConfiguration(LoaderInterface $loader)
{
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
$loader->load($this->getProjectDir().'/app/config/config_'.$this->getEnvironment().'.yml');
}

/**
* Returns any custom bundles for a custom setup. Override this
* method in a custom AppKernel.
*
* @return array
*/
public function getCustomBundles()
{
return [];
}
}
Loading