Permalink
Browse files

Merge branch 'forkcms/5.0.0-dev' into remove-library

# Conflicts:
#	UPGRADE_5.0.md
  • Loading branch information...
jeroendesloovere committed Feb 23, 2017
1 parent d4453b7 commit c6e5b3bcfd4561a66c8b878295f4b64e594208bb
Showing with 5,108 additions and 198 deletions.
  1. +4 −0 .gitattributes
  2. +3 −2 .htaccess
  3. +3 −5 .travis.yml
  4. +41 −0 UPGRADE_5.0.md
  5. +20 −22 app/AppKernel.php
  6. +5 −1 app/ApplicationInterface.php
  7. +3 −1 app/BaseModel.php
  8. +12 −10 app/{routing.php → ForkController.php}
  9. +6 −2 app/Kernel.php
  10. +4 −1 app/KernelLoader.php
  11. +5 −5 app/config/routing.yml
  12. +2 −2 app/console
  13. +0 −4 autoload.php
  14. +7 −2 composer.json
  15. +35 −0 docs/01. installation/01. installation.md
  16. +53 −0 docs/01. installation/02. installation_wizard.md
  17. +19 −0 docs/01. installation/03. minimum_requirements.md
  18. +164 −0 docs/01. installation/04. webservers.md
  19. +65 −0 docs/01. installation/05. upgrading.md
  20. +32 −0 docs/01. installation/06. version_control.md
  21. +16 −0 docs/01. installation/07. faq.md
  22. BIN docs/01. installation/assets/installation_step2.png
  23. BIN docs/01. installation/assets/installation_step2_filesystem.png
  24. BIN docs/01. installation/assets/installation_step3.png
  25. BIN docs/01. installation/assets/installation_step4.png
  26. BIN docs/01. installation/assets/installation_step5.png
  27. BIN docs/01. installation/assets/installation_step6.png
  28. BIN docs/01. installation/assets/installation_step7.png
  29. BIN docs/01. installation/assets/started_download.png
  30. BIN docs/01. installation/assets/started_install.png
  31. BIN docs/01. installation/assets/started_upload.png
  32. +9 −0 docs/02. getting started/01. introduction.md
  33. +11 −0 docs/02. getting started/02. adding_modules.md
  34. +13 −0 docs/02. getting started/03. adding_a_theme.md
  35. +35 −0 docs/02. getting started/04. spam_protection.md
  36. +15 −0 docs/02. getting started/05. linking_facebook.md
  37. +15 −0 docs/02. getting started/06. enable_twittercards.md
  38. +26 −0 docs/02. getting started/07. configuring_cronjobs.md
  39. +14 −0 docs/02. getting started/08. publish_your_website.md
  40. BIN docs/02. getting started/assets/akismet_final.png
  41. BIN docs/02. getting started/assets/akismet_step1.png
  42. BIN docs/02. getting started/assets/akismet_step2.png
  43. BIN docs/02. getting started/assets/akismet_step3.png
  44. BIN docs/02. getting started/assets/akismet_step4.png
  45. BIN docs/02. getting started/assets/analyses.png
  46. BIN docs/02. getting started/assets/cronjobs_analytics.png
  47. BIN docs/02. getting started/assets/facebook_fork.png
  48. BIN docs/02. getting started/assets/facebook_id.png
  49. BIN docs/02. getting started/assets/modules.png
  50. BIN docs/02. getting started/assets/modules_upload.png
  51. BIN docs/02. getting started/assets/themes.png
  52. +3 −0 docs/03. user guide/01. introduction.md
  53. +42 −0 docs/03. user guide/02. dashboard.md
  54. +61 −0 docs/03. user guide/03. pages.md
  55. +45 −0 docs/03. user guide/04. the_editor.md
  56. +61 −0 docs/03. user guide/05. standard_modules.md
  57. +27 −0 docs/03. user guide/06. seo.md
  58. +20 −0 docs/03. user guide/07. marketing.md
  59. +37 −0 docs/03. user guide/08. mailmotor.md
  60. +93 −0 docs/03. user guide/09. settings.md
  61. BIN docs/03. user guide/assets/dashboard_analytics.png
  62. BIN docs/03. user guide/assets/dashboard_comments.png
  63. BIN docs/03. user guide/assets/dashboard_keywords.png
  64. BIN docs/03. user guide/assets/dashboard_personalize.png
  65. BIN docs/03. user guide/assets/dashboard_referrers.png
  66. BIN docs/03. user guide/assets/editor_embed.png
  67. BIN docs/03. user guide/assets/editor_folder.png
  68. BIN docs/03. user guide/assets/editor_image.png
  69. BIN docs/03. user guide/assets/editor_table.png
  70. BIN docs/03. user guide/assets/editor_unlocked.png
  71. BIN docs/03. user guide/assets/editor_youtubecode.png
  72. BIN docs/03. user guide/assets/modules_faq_reorder.png
  73. BIN docs/03. user guide/assets/modules_location_add.png
  74. BIN docs/03. user guide/assets/modules_search_statistics.png
  75. BIN docs/03. user guide/assets/modules_search_synonyms.png
  76. BIN docs/03. user guide/assets/pages_authentication.png
  77. BIN docs/03. user guide/assets/pages_choosecontent.png
  78. BIN docs/03. user guide/assets/pages_choosetemplate.png
  79. BIN docs/03. user guide/assets/pages_content.png
  80. BIN docs/03. user guide/assets/pages_movepage.png
  81. BIN docs/03. user guide/assets/pages_redirect.png
  82. BIN docs/03. user guide/assets/pages_seo.png
  83. BIN docs/03. user guide/assets/pages_settings.png
  84. BIN docs/03. user guide/assets/pages_tags.png
  85. BIN docs/03. user guide/assets/pages_versions.png
  86. BIN docs/03. user guide/assets/settings_general_apikeys.png
  87. BIN docs/03. user guide/assets/settings_general_ckfinder.png
  88. BIN docs/03. user guide/assets/settings_general_datetimes _and_numbers.png
  89. BIN docs/03. user guide/assets/settings_general_facebook.png
  90. BIN docs/03. user guide/assets/settings_general_languages.png
  91. BIN docs/03. user guide/assets/settings_general_scripts.png
  92. BIN docs/03. user guide/assets/settings_pages_meta.png
  93. BIN docs/03. user guide/assets/settings_search_weight.png
  94. BIN docs/03. user guide/assets/settings_translations_add.png
  95. BIN docs/03. user guide/assets/settings_translations_overview.png
  96. BIN docs/03. user guide/assets/settings_users_permissions.png
  97. BIN docs/03. user guide/assets/settings_warnings.png
  98. +3 −0 docs/04. theming guide/01. introduction.md
  99. +9 −0 docs/04. theming guide/02. what_is_a_theme_within_fork.md
  100. +37 −0 docs/04. theming guide/03. theme_contents.md
  101. +29 −0 docs/04. theming guide/04. page_templates_positions_and_blocks.md
  102. +192 −0 docs/04. theming guide/05. making_a_basic_theme.md
  103. +54 −0 docs/04. theming guide/06. creating_a_template.md
  104. +93 −0 docs/04. theming guide/07. locale_and_translations.md
  105. +66 −0 docs/04. theming guide/08. theme_checklist.md
  106. BIN docs/04. theming guide/assets/addtheme.jpg
  107. BIN docs/04. theming guide/assets/daytwo.jpg
  108. BIN docs/04. theming guide/assets/dump.jpg
  109. BIN docs/04. theming guide/assets/position_code.jpg
  110. BIN docs/04. theming guide/assets/settings_themes_templates.png
  111. BIN docs/04. theming guide/assets/structure.jpg
  112. BIN docs/04. theming guide/assets/template.jpg
  113. BIN docs/04. theming guide/assets/theme_structure.jpg
  114. +3 −0 docs/05. module guide/01. introduction.md
  115. +28 −0 docs/05. module guide/02. applications_and_library.md
  116. +122 −0 docs/05. module guide/03. routing.md
  117. +135 −0 docs/05. module guide/04. modeling_your_module.md
  118. +136 −0 docs/05. module guide/05. writing_your_module.md
  119. +113 −0 docs/05. module guide/06. blocks_and_widgets.md
  120. +21 −0 docs/05. module guide/07. templates.md
  121. +89 −0 docs/05. module guide/08. translations_or_locale.md
  122. +265 −0 docs/05. module guide/09. forms.md
  123. +143 −0 docs/05. module guide/10. data_grids.md
  124. +19 −0 docs/05. module guide/11. generate_thumbnails_based_on_folder.md
  125. +123 −0 docs/05. module guide/12. javascript.md
  126. +58 −0 docs/05. module guide/13. ajax.md
  127. +52 −0 docs/05. module guide/14. passing_data_from_php_to_javascript.md
  128. +85 −0 docs/05. module guide/15. cronjobs.md
  129. +25 −0 docs/05. module guide/16. module_settings.md
  130. +72 −0 docs/05. module guide/17. pagination.md
  131. +107 −0 docs/05. module guide/18. meta_data_and_seo.md
  132. +14 −0 docs/05. module guide/19. breadcrumbs.md
  133. +43 −0 docs/05. module guide/20. tags.md
  134. +75 −0 docs/05. module guide/21. search.md
  135. +277 −0 docs/05. module guide/22. creating_frontend_widgets.md
  136. +46 −0 docs/05. module guide/23. api.md
  137. +315 −0 docs/05. module guide/24. how_does_the_api_work.md
  138. +35 −0 docs/05. module guide/25. events_publish_and_subscribe.md
  139. +178 −0 docs/05. module guide/26. creating_an_installer.md
  140. +35 −0 docs/05. module guide/27. creating_a_module_zip_file.md
  141. +18 −0 docs/05. module guide/28. twittercards.md
  142. +221 −0 docs/05. module guide/29. symfony_form_file.md
  143. +226 −0 docs/05. module guide/30. symfony_form_image.md
  144. BIN docs/05. module guide/assets/detail.png
  145. BIN docs/05. module guide/assets/how_apple_push_works.png
  146. BIN docs/05. module guide/assets/info_xml.png
  147. BIN docs/05. module guide/assets/locale.png
  148. BIN docs/05. module guide/assets/meta.png
  149. BIN docs/05. module guide/assets/translations.png
  150. +98 −0 docs/06. contribute/01. introduction.md
  151. +27 −0 docs/06. contribute/02. testing.md
  152. +31 −0 docs/06. contribute/03. features.md
  153. +5 −0 docs/06. contribute/04. translations.md
  154. +5 −0 docs/06. contribute/05. user_interface.md
  155. +41 −0 docs/06. contribute/06. documentation.md
  156. +34 −0 docs/06. contribute/07. spreading_the_word.md
  157. +25 −0 docs/06. contribute/08. open_sourcing_fork_cms_modules_and_themes.md
  158. +94 −0 docs/README.md
  159. +1 −2 index.php
  160. +0 −2 phpunit.xml.dist
  161. +2 −1 src/Backend/Core/Engine/Ajax.php
  162. +3 −1 src/Backend/Core/Engine/Backend.php
  163. +2 −1 src/Backend/Core/Engine/Base/Object.php
  164. +2 −1 src/Backend/Core/Engine/Base/Widget.php
  165. +2 −1 src/Backend/Core/Engine/Cronjob.php
  166. +7 −0 src/Backend/Core/Installer/CoreInstaller.php
  167. +12 −13 src/Backend/Core/Installer/Data/install.sql
  168. +32 −0 src/Backend/Core/Layout/Templates/FormLayout.html.twig
  169. +13 −0 src/Backend/Core/Layout/Templates/breadcrumb.html.twig
  170. +20 −0 src/Backend/Core/Layout/Templates/macros.html.twig
  171. +1 −0 src/Backend/Form/Type/MetaType.php
  172. +19 −41 src/Backend/Modules/Blog/Layout/Templates/Index.html.twig
  173. +1 −12 src/Backend/Modules/ContentBlocks/Layout/Templates/Index.html.twig
  174. +1 −12 src/Backend/Modules/FormBuilder/Layout/Templates/Index.html.twig
  175. +1 −1 src/Backend/Modules/Pages/Actions/Add.php
  176. +7 −7 src/Backend/Modules/Pages/Actions/Edit.php
  177. +2 −1 src/Backend/Modules/Pages/Engine/Model.php
  178. +1 −9 src/Backend/Modules/Users/Layout/Templates/Index.html.twig
  179. +2 −1 src/Common/Core/Init.php
  180. +2 −3 src/Common/Core/Model.php
  181. +1 −1 src/Common/Doctrine/Entity/Meta.php
  182. +2 −17 src/Common/WebTestCase.php
  183. +3 −1 src/Frontend/Core/Engine/Ajax.php
  184. +2 −1 src/Frontend/Core/Engine/Base/AjaxAction.php
  185. +2 −1 src/Frontend/Core/Engine/Base/Config.php
  186. +2 −1 src/Frontend/Core/Engine/Base/Object.php
  187. +3 −1 src/Frontend/Core/Engine/Frontend.php
  188. +1 −0 src/Frontend/Core/Engine/TemplateModifiers.php
  189. +3 −1 src/Frontend/Core/Engine/Url.php
  190. +8 −8 tests/data/test_db.sql
@@ -0,0 +1,4 @@
/docs export-ignore
/.github export-ignore
.gitattributes export-ignore
.travis.yml export-ignore
@@ -35,9 +35,10 @@ FileETag MTime Size
RewriteRule src/Backend/Cache/Locale/.*\.php - [F]
# redirect all trafic to https
# RewriteCond %{SERVER_PORT} 80
# Header set Strict-Transport-Security "max-age=31536000; includeSubDomains" env=HTTPS
# RewriteCond %{HTTPS} != on
# RewriteCond %{HTTP_HOST} !.*\.dev [NC]
# RewriteRule ^(.*)$ https://www.<domain>.be/$1 [R=301,L]
# RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
# one url to rule them all
# RewriteCond %{HTTP_HOST} !^www\.<domain>\.be [NC]
@@ -4,12 +4,10 @@ matrix:
include:
- php: 7.0
- php: 7.1
- php: hhvm
allow_failures:
- php: hhvm
script:
- phpunit --coverage-clover=coverage.clover
- bin/phpcs --standard=psr2 --extensions=php --warning-severity=0 --ignore=src/Backend/Core/Js/ckfinder,src/Backend/Cache,src/Frontend/Cache,src/Backend/Core/Js/ckeditor --report=full "src"
before_script:
- npm install -g bower
@@ -20,8 +18,8 @@ before_script:
- mysql -e "SET GLOBAL wait_timeout = 3600" # try to avoid mysql has gone away errors
after_success:
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [[ "$TRAVIS_PHP_VERSION" != "7.1" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [[ "$TRAVIS_PHP_VERSION" != "7.1" ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
- if [[ "$TRAVIS_PHP_VERSION" != "7.1" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
- if [[ "$TRAVIS_PHP_VERSION" != "7.1" ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
after_failure:
- cat app/logs/test.log
@@ -179,3 +179,44 @@ PATH_LIBRARY is removed.
### site.path_library
site.path_library is removed.
## meta table is now using InnoDB
In order to use constraints in mysql 5.5 we need to use InnoDB
Execute the following queries to migrate
RENAME TABLE meta TO old_meta;
CREATE TABLE `meta` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`keywords` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`keywords_overwrite` enum('Y','N') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT '(DC2Type:enum_bool)',
`description` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`description_overwrite` enum('Y','N') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT '(DC2Type:enum_bool)',
`title` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`title_overwrite` enum('Y','N') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT '(DC2Type:enum_bool)',
`url` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL,
`url_overwrite` enum('Y','N') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N' COMMENT '(DC2Type:enum_bool)',
`custom` longtext COLLATE utf8mb4_unicode_ci,
`data` longtext COLLATE utf8mb4_unicode_ci,
PRIMARY KEY (`id`),
KEY `idx_url` (`url`(191))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
INSERT INTO meta SELECT * FROM old_meta;
DROP TABLE old_meta;
## PSR-4
We are now using PSR-4
As part of this transition the classes in the app directory are now also autoloaded and can be accessed via the ForkCMS\App namespace
routing.php has been renamed to ForkController because we need the classname to match the filename
| Old classname | New classname |
|-----------------------|-----------------------------------|
| \KernelLoader | \ForkCMS\App\KernelLoader |
| \Kernel | \ForkCMS\App\Kernel |
| \ApplicationRouting | \ForkCMS\App\ForkController |
| \BaseModel | \ForkCMS\App\BaseModel |
| \ApplicationInterface | \ForkCMS\App\ApplicationInterface |
| \AppKernel | \ForkCMS\App\AppKernel |
@@ -1,5 +1,7 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
@@ -10,10 +12,6 @@
use Symfony\Component\Config\Loader\LoaderInterface;
use Symfony\Component\Filesystem\Filesystem;
// hardcoded this for now, this should be autoloaded
require_once __DIR__ . '/Kernel.php';
require_once __DIR__ . '/routing.php';
/**
* The AppKernel provides a proper way to handle a request and transform it into a response.
*/
@@ -27,25 +25,25 @@ class AppKernel extends Kernel
public function registerBundles()
{
$bundles = array(
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new Symfony\Bundle\MonologBundle\MonologBundle(),
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
new ForkCMS\Bundle\InstallerBundle\ForkCMSInstallerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(),
new SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle(),
new SimpleBus\SymfonyBridge\SimpleBusEventBusBundle(),
new Backend\Modules\Mailmotor\Mailmotor,
new MailMotor\Bundle\MailMotorBundle\MailMotorMailMotorBundle(),
new MailMotor\Bundle\MailChimpBundle\MailMotorMailChimpBundle(),
new MailMotor\Bundle\CampaignMonitorBundle\MailMotorCampaignMonitorBundle(),
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new \Symfony\Bundle\TwigBundle\TwigBundle(),
new \Symfony\Bundle\MonologBundle\MonologBundle(),
new \Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
new \ForkCMS\Bundle\InstallerBundle\ForkCMSInstallerBundle(),
new \Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new \SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(),
new \SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle(),
new \SimpleBus\SymfonyBridge\SimpleBusEventBusBundle(),
new \Backend\Modules\Mailmotor\Mailmotor,
new \MailMotor\Bundle\MailMotorBundle\MailMotorMailMotorBundle(),
new \MailMotor\Bundle\MailChimpBundle\MailMotorMailChimpBundle(),
new \MailMotor\Bundle\CampaignMonitorBundle\MailMotorCampaignMonitorBundle(),
);
if (in_array($this->getEnvironment(), array('dev', 'test'))) {
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new \Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new \Symfony\Bundle\DebugBundle\DebugBundle();
}
return $bundles;
@@ -61,8 +59,8 @@ public function registerContainerConfiguration(LoaderInterface $loader)
$loader->load(__DIR__ . '/config/config.yml');
}
if ($fs->exists(__DIR__.'/config/config_'.$this->getEnvironment().'.yml')) {
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
if ($fs->exists(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml')) {
$loader->load(__DIR__ . '/config/config_' . $this->getEnvironment() . '.yml');
}
}
}
@@ -1,12 +1,16 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
* For the full copyright and license information, please view the license
* file that was distributed with this source code.
*/
use Symfony\Component\HttpFoundation\Response;
/**
* If you want to extend Fork with an application of your own, you should implement this interface
* to ensure that initialize() and display() are *always* present.
@@ -24,7 +28,7 @@ public function initialize();
/**
* Sends the output of the app to our browser, in the form of a Response object.
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function display();
}
@@ -1,5 +1,7 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
@@ -18,7 +20,7 @@
class BaseModel
{
/**
* @var Symfony\Component\DependencyInjection\ContainerInterface
* @var ContainerInterface
*/
private static $container;
@@ -1,22 +1,24 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
* For the full copyright and license information, please view the license
* file that was distributed with this source code.
*/
use Symfony\Component\HttpFoundation\Request;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Backend\Init as BackendInit;
use Frontend\Init as FrontendInit;
use Common\Exception\RedirectException;
use Symfony\Component\HttpFoundation\Response;
/**
* Application routing
*/
class ApplicationRouting extends Controller
class ForkController extends Controller
{
const DEFAULT_APPLICATION = 'Frontend';
@@ -45,7 +47,7 @@ public static function getRoutes()
/**
* Runs the backend
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function backendController()
{
@@ -61,7 +63,7 @@ public function backendController()
/**
* Runs the backend ajax requests
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function backendAjaxController()
{
@@ -76,7 +78,7 @@ public function backendAjaxController()
/**
* Runs the cronjobs
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function backendCronjobController()
{
@@ -91,7 +93,7 @@ public function backendCronjobController()
/**
* Runs the frontend requests
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function frontendController()
{
@@ -106,7 +108,7 @@ public function frontendController()
/**
* Runs the frontend ajax requests
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
public function frontendAjaxController()
{
@@ -121,11 +123,11 @@ public function frontendAjaxController()
/**
* Runs an application and returns the Response
*
* @param \ApplicationInterface $application
* @param ApplicationInterface $application
*
* @return Symfony\Component\HttpFoundation\Response
* @return Response
*/
protected function handleApplication(\ApplicationInterface $application)
protected function handleApplication(ApplicationInterface $application)
{
$application->passContainerToModels();
@@ -1,27 +1,31 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
* For the full copyright and license information, please view the license
* file that was distributed with this source code.
*/
use PDOException;
use Spoon;
use SpoonDatabaseException;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Finder\Finder;
use Symfony\Component\HttpKernel\DependencyInjection\MergeExtensionConfigurationPass;
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelInterface;
use Backend\DependencyInjection\BackendExtension;
/**
* The Kernel provides a proper way to load an environment and DI container.
* It also handles requests and responses.
*/
abstract class Kernel extends BaseKernel implements KernelInterface
abstract class Kernel extends BaseKernel
{
/** @var Request We need this to check if a module is being installed */
private $request;
@@ -1,12 +1,15 @@
<?php
namespace ForkCMS\App;
/*
* This file is part of Fork CMS.
*
* For the full copyright and license information, please view the license
* file that was distributed with this source code.
*/
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpKernel\KernelInterface;
use Backend\Core\Engine\Model as BackendModel;
use Frontend\Core\Engine\Model as FrontendModel;
@@ -42,7 +45,7 @@ public function get($reference)
}
/**
* @return Symfony\Component\DependencyInjection\ContainerInterface
* @return ContainerInterface
*/
public function getContainer()
{
@@ -1,26 +1,26 @@
backend:
path: /private/{_locale}/{module}/{action}
defaults:
_controller: ApplicationRouting::backendController
_controller: \ForkCMS\App\ForkController::backendController
_locale: ~
module: ~
action: ~
backend_ajax:
path: /backend/ajax
defaults:
_controller: ApplicationRouting::backendAjaxController
_controller: \ForkCMS\App\ForkController::backendAjaxController
backend_cronjob:
path: /backend/cronjob
defaults:
_controller: ApplicationRouting::backendCronjobController
_controller: \ForkCMS\App\ForkController::backendCronjobController
frontend_ajax:
path: /frontend/ajax
defaults:
_controller: ApplicationRouting::frontendAjaxController
_controller: \ForkCMS\App\ForkController::frontendAjaxController
frontend:
path: /{route}
defaults:
_controller: ApplicationRouting::frontendController
_controller: \ForkCMS\App\ForkController::frontendController
route: ~
requirements:
route: (.*)
@@ -8,10 +8,10 @@
set_time_limit(0);
require_once __DIR__ . '/../autoload.php';
require_once __DIR__ . '/AppKernel.php';
require_once __DIR__ . '/BaseModel.php';
use Common\ModulesSettings;
use ForkCMS\App\AppKernel;
use ForkCMS\App\BaseModel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Debug\Debug;
Oops, something went wrong.

0 comments on commit c6e5b3b

Please sign in to comment.