diff --git a/.gitignore b/.gitignore index 4333b69b3..a695150c2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ local/config/runtime-conf.xml cache/* log/* bin/* -composer.lock local/session/* coverage diff --git a/composer.lock b/composer.lock new file mode 100644 index 000000000..2333d1650 --- /dev/null +++ b/composer.lock @@ -0,0 +1,589 @@ +{ + "hash": "bec45b0a4848cd287809e9a0a83b6d51", + "packages": [ + { + "name": "ircmaxell/password-compat", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "fc4ad2d46794ace07cbf04fe654a8bf546fc6764" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/fc4ad2d46794ace07cbf04fe654a8bf546fc6764", + "reference": "fc4ad2d46794ace07cbf04fe654a8bf546fc6764", + "shasum": "" + }, + "time": "2013-02-04 16:45:02", + "type": "library", + "autoload": { + "files": [ + "lib/password.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" + } + ], + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", + "keywords": [ + "password", + "hashing" + ] + }, + { + "name": "phing/phing", + "version": "2.4.14", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing", + "reference": "2.4.14" + }, + "dist": { + "type": "zip", + "url": "https://github.com/phingofficial/phing/archive/2.4.14.zip", + "reference": "2.4.14", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "time": "2012-11-29 21:23:47", + "bin": [ + "bin/phing" + ], + "type": "library", + "autoload": { + "classmap": [ + "classes/phing/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "classes" + ], + "license": [ + "LGPL3" + ], + "authors": [ + { + "name": "Michiel Rook", + "email": "mrook@php.net" + }, + { + "name": "Phing Community", + "homepage": "http://www.phing.info/trac/wiki/Development/Contributors" + } + ], + "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", + "homepage": "http://www.phing.info/", + "keywords": [ + "build", + "task", + "tool" + ] + }, + { + "name": "propel/propel1", + "version": "1.6.7", + "source": { + "type": "git", + "url": "https://github.com/propelorm/Propel", + "reference": "1.6.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/propelorm/Propel/zipball/1.6.7", + "reference": "1.6.7", + "shasum": "" + }, + "require": { + "php": ">=5.2.4", + "phing/phing": ">=2.4.12,2.4.*" + }, + "time": "2012-07-30 00:58:15", + "bin": [ + "generator/bin/propel-gen", + "generator/bin/propel-gen.bat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6-dev" + } + }, + "autoload": { + "classmap": [ + "runtime/lib", + "generator/lib" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "runtime/lib", + "generator/lib" + ], + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "william.durand1@gmail.com", + "homepage": "http://www.willdurand.fr" + } + ], + "description": "Propel is an open-source Object-Relational Mapping (ORM) for PHP5.", + "homepage": "http://www.propelorm.org/", + "keywords": [ + "database", + "orm", + "persistence", + "Active Record", + "mapping" + ] + }, + { + "name": "psr/log", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "time": "2012-12-21 11:40:51", + "type": "library", + "autoload": { + "psr-0": { + "Psr\\Log\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "keywords": [ + "log", + "psr", + "psr-3" + ] + }, + { + "name": "symfony/class-loader", + "version": "v2.1.7", + "target-dir": "Symfony/Component/ClassLoader", + "source": { + "type": "git", + "url": "https://github.com/symfony/ClassLoader", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/ClassLoader/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/finder": "2.1.*" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\ClassLoader": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony ClassLoader Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/config", + "version": "v2.1.7", + "target-dir": "Symfony/Component/Config", + "source": { + "type": "git", + "url": "https://github.com/symfony/Config", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Config/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Config": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Config Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/console", + "version": "v2.1.7", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Console/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-17 15:20:05", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Console": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/dependency-injection", + "version": "v2.1.7", + "target-dir": "Symfony/Component/DependencyInjection", + "source": { + "type": "git", + "url": "https://github.com/symfony/DependencyInjection", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/DependencyInjection/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" + }, + "suggest": { + "symfony/yaml": "2.1.*", + "symfony/config": "2.1.*" + }, + "time": "2013-01-17 21:21:51", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\DependencyInjection": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony DependencyInjection Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/event-dispatcher", + "version": "v2.1.7", + "target-dir": "Symfony/Component/EventDispatcher", + "source": { + "type": "git", + "url": "https://github.com/symfony/EventDispatcher", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/EventDispatcher/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/dependency-injection": "2.1.*" + }, + "suggest": { + "symfony/dependency-injection": "2.1.*", + "symfony/http-kernel": "2.1.*" + }, + "time": "2013-01-11 00:31:43", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\EventDispatcher": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/http-foundation", + "version": "v2.1.7", + "target-dir": "Symfony/Component/HttpFoundation", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpFoundation", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/HttpFoundation/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2013-01-11 00:31:43", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpFoundation": "", + "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony HttpFoundation Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/http-kernel", + "version": "v2.1.7", + "target-dir": "Symfony/Component/HttpKernel", + "source": { + "type": "git", + "url": "https://github.com/symfony/HttpKernel", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/HttpKernel/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/event-dispatcher": "2.1.*", + "symfony/http-foundation": "2.1.*" + }, + "require-dev": { + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*", + "symfony/process": "2.1.*", + "symfony/routing": "2.1.*" + }, + "suggest": { + "symfony/browser-kit": "2.1.*", + "symfony/class-loader": "2.1.*", + "symfony/config": "2.1.*", + "symfony/console": "2.1.*", + "symfony/dependency-injection": "2.1.*", + "symfony/finder": "2.1.*" + }, + "time": "2013-01-17 16:21:47", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\HttpKernel": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony HttpKernel Component", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/routing", + "version": "v2.1.7", + "target-dir": "Symfony/Component/Routing", + "source": { + "type": "git", + "url": "https://github.com/symfony/Routing", + "reference": "v2.1.7" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/Routing/archive/v2.1.7.zip", + "reference": "v2.1.7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", + "symfony/http-kernel": "2.1.*", + "doctrine/common": ">=2.2,<2.4-dev" + }, + "suggest": { + "symfony/config": "2.1.*", + "symfony/yaml": "2.1.*", + "doctrine/common": ">=2.2,<2.4-dev" + }, + "time": "2013-01-09 08:51:07", + "type": "library", + "autoload": { + "psr-0": { + "Symfony\\Component\\Routing": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony Routing Component", + "homepage": "http://symfony.com" + } + ], + "packages-dev": null, + "aliases": [ + + ], + "minimum-stability": "stable", + "stability-flags": { + "ircmaxell/password-compat": 20, + "psr/log": 20 + } +} diff --git a/core/lib/Thelia/Core/Template/Parser.php b/core/lib/Thelia/Core/Template/Parser.php index 05b6e7a59..783a51fdf 100644 --- a/core/lib/Thelia/Core/Template/Parser.php +++ b/core/lib/Thelia/Core/Template/Parser.php @@ -139,9 +139,11 @@ class Parser implements ParserInterface public function loadParser() { $content = $this->openFile($this->getRequest()); + + $content = $this->parseInclude($content); } - public function openFile(Request $request) + protected function openFile(Request $request) { $file = $request->attributes->get('_view'); $fileName = THELIA_TEMPLATE_DIR . rtrim($this->template, "/") . "/" . $file . ".html"; @@ -150,8 +152,14 @@ class Parser implements ParserInterface } else { throw new ResourceNotFoundException(sprintf("%s file not found in %s template", $file, $this->template)); } + + return $content; } + protected function parseInclude($content) + { + + } } diff --git a/documentation/api/class-Thelia.Controller.DefaultController.html b/documentation/api/class-Thelia.Controller.DefaultController.html index 5c161e827..753018f01 100644 --- a/documentation/api/class-Thelia.Controller.DefaultController.html +++ b/documentation/api/class-Thelia.Controller.DefaultController.html @@ -153,7 +153,7 @@ Author: Manuel Raynaud <mraynadu@openstudio.fr>
- Located at core/lib/Thelia/Controller/DefaultController.php
+ Located at core/lib/Thelia/Controller/DefaultController.php
@@ -171,7 +171,7 @@ href="mailto:mraynadu@openstudio.fr">mraynadu@openstudio.fr&g
# - noAction( Symfony\Component\HttpFoundation\Request $request ) + noAction( Symfony\Component\HttpFoundation\Request $request )
diff --git a/documentation/api/class-Thelia.Core.Event.TheliaEvents.html b/documentation/api/class-Thelia.Core.Event.TheliaEvents.html index 37faca880..1e994fb7f 100644 --- a/documentation/api/class-Thelia.Core.Event.TheliaEvents.html +++ b/documentation/api/class-Thelia.Core.Event.TheliaEvents.html @@ -141,7 +141,7 @@ Author: Manuel Raynaud <mraynaud@openstudio.fr>
- Located at core/lib/Thelia/Core/Event/TheliaEvents.php
+ Located at core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -180,6 +180,32 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g Thelia\Routing\Matcher\ActionMatcher)

+
+ + + + + string + + INCLUSION + + "thelia.include" +
+ # + +
+ +

INCLUDE event

+ +
+ +
diff --git a/documentation/api/class-Thelia.Core.EventListener.ViewListener.html b/documentation/api/class-Thelia.Core.EventListener.ViewListener.html index 51400b048..2f174c617 100644 --- a/documentation/api/class-Thelia.Core.EventListener.ViewListener.html +++ b/documentation/api/class-Thelia.Core.EventListener.ViewListener.html @@ -152,7 +152,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr>
TODO: Look if it's possible to block this definition in dependency-injection
- Located at core/lib/Thelia/Core/EventListener/ViewListener.php
+ Located at core/lib/Thelia/Core/EventListener/ViewListener.php
@@ -170,7 +170,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - __construct( Thelia\Core\Template\ParserInterface $parser ) + __construct( Symfony\Component\DependencyInjection\ContainerInterface $container )
@@ -182,7 +182,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g

Parameters

-
$parser
+
$container
Thelia\Core\Template\ParserInterface
$parser
@@ -204,7 +204,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - onKernelView( Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event ) + onKernelView( Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event )
@@ -228,6 +228,64 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g +
+
+ + + + + public + + + + + +
+ # + beforeKernelView( Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event ) + +
+ +
+ + +
+ + + + + public + + + + + +
+ # + findView( Symfony\Component\HttpFoundation\Request $request ) + +
+ +
+ +
@@ -242,7 +300,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - getSubscribedEvents( ) + getSubscribedEvents( )
diff --git a/documentation/api/class-Thelia.Core.Template.Parser.html b/documentation/api/class-Thelia.Core.Template.Parser.html index 87a505f92..08eaa5354 100644 --- a/documentation/api/class-Thelia.Core.Template.Parser.html +++ b/documentation/api/class-Thelia.Core.Template.Parser.html @@ -156,7 +156,7 @@ parser

Author: Manuel Raynaud <mraynaud@openstudio.fr>
- Located at core/lib/Thelia/Core/Template/Parser.php
+ Located at core/lib/Thelia/Core/Template/Parser.php
@@ -174,7 +174,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - __construct( Symfony\Component\DependencyInjection\ContainerInterface $container ) + __construct( Symfony\Component\DependencyInjection\ContainerInterface $container )
@@ -194,6 +194,72 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g +
+
+ + + + + public + Symfony\Component\HttpFoundation\Request + + + + +
+ # + getRequest( ) + +
+ +
+ + +
+ + + + + public + Symfony\Component\EventDispatcher\EventDispatcher + + + + +
+ # + getDispatcher( ) + +
+ +
+ +
@@ -208,7 +274,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - getContent( ) + getContent( )
@@ -242,7 +308,7 @@ or the content of the response

# - setContent( string|Symfony\Component\HttpFoundation\Response $content ) + setContent( string|Symfony\Component\HttpFoundation\Response $content )
@@ -281,7 +347,7 @@ directly

# - getStatus( ) + getStatus( )
@@ -316,7 +382,7 @@ directly

# - setStatus( integer $status ) + setStatus( integer $status )
@@ -354,7 +420,40 @@ directly

# - loadParser( ) + loadParser( ) + +
+ +

Main parser function, load the parser

+ +
+ + +
+ + + + + public + + + + + +
+ # + openFile( Symfony\Component\HttpFoundation\Request $request )
@@ -387,7 +486,7 @@ directly

string - PREFIXE + PREFIXE 'prx'
@@ -407,7 +506,7 @@ directly

boolean - SHOW_TIME + SHOW_TIME true
@@ -427,7 +526,7 @@ directly

boolean - ALLOW_DEBUG + ALLOW_DEBUG true
@@ -447,7 +546,7 @@ directly

boolean - USE_CACHE + USE_CACHE true
@@ -477,7 +576,7 @@ directly

- $container + $container
@@ -500,7 +599,7 @@ directly

- $content + $content
@@ -523,7 +622,7 @@ directly

- $status + $status 200
@@ -536,6 +635,29 @@ directly

+
+ + + + protected + string + + + + $template + + "default" +
+ # + +
+ +
+ +
diff --git a/documentation/api/class-Thelia.Core.Thelia.html b/documentation/api/class-Thelia.Core.Thelia.html index 05642a0e4..f70e3ba89 100644 --- a/documentation/api/class-Thelia.Core.Thelia.html +++ b/documentation/api/class-Thelia.Core.Thelia.html @@ -146,7 +146,7 @@ Symfony\Component\HttpKernel\Kernel Namespace: Thelia\Core
- Located at core/lib/Thelia/Core/Thelia.php
+ Located at core/lib/Thelia/Core/Thelia.php
@@ -164,7 +164,7 @@ Symfony\Component\HttpKernel\Kernel
# - init( ) + init( )
@@ -193,7 +193,7 @@ Symfony\Component\HttpKernel\Kernel
# - initPropel( ) + initPropel( )
@@ -222,7 +222,7 @@ Symfony\Component\HttpKernel\Kernel
# - loadConfiguration( ) + loadConfiguration( )
@@ -239,6 +239,37 @@ Symfony\Component\HttpKernel\Kernel +
+
+ + + + + public + + + + + +
+ # + boot( ) + +
+ +
+ +
@@ -253,7 +284,7 @@ Symfony\Component\HttpKernel\Kernel
# - getCacheDir( ) + getCacheDir( )
@@ -293,7 +324,7 @@ Symfony\Component\HttpKernel\Kernel
# - getLogDir( ) + getLogDir( )
@@ -333,7 +364,7 @@ Symfony\Component\HttpKernel\Kernel
# - registerBundles( ) + registerBundles( )
@@ -372,7 +403,7 @@ Symfony\Component\HttpKernel\Kernel
# - registerContainerConfiguration( Symfony\Component\Config\Loader\LoaderInterface $loader ) + registerContainerConfiguration( Symfony\Component\Config\Loader\LoaderInterface $loader )
diff --git a/documentation/api/class-Thelia.Core.TheliaHttpKernel.html b/documentation/api/class-Thelia.Core.TheliaHttpKernel.html index 0cea7a744..80de032b7 100644 --- a/documentation/api/class-Thelia.Core.TheliaHttpKernel.html +++ b/documentation/api/class-Thelia.Core.TheliaHttpKernel.html @@ -149,7 +149,7 @@ Symfony\Component\HttpKernel\HttpKernel Author: Manuel Raynaud <mraynaud@openstudio.fr>
- Located at core/lib/Thelia/Core/TheliaHttpKernel.php
+ Located at core/lib/Thelia/Core/TheliaHttpKernel.php
@@ -167,7 +167,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - __construct( Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher, Symfony\Component\DependencyInjection\ContainerInterface $container, Symfony\Component\HttpKernel\Controller\ControllerResolverInterface $controllerResolver ) + __construct( Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher, Symfony\Component\DependencyInjection\ContainerInterface $container, Symfony\Component\HttpKernel\Controller\ControllerResolverInterface $controllerResolver )
@@ -196,7 +196,7 @@ href="mailto:mraynaud@openstudio.fr">mraynaud@openstudio.fr&g
# - handle( Symfony\Component\HttpFoundation\Request $request, integer $type = Thelia\Core\HttpKernelInterface::MASTER_REQUEST, Boolean $catch = true ) + handle( Symfony\Component\HttpFoundation\Request $request, integer $type = Thelia\Core\HttpKernelInterface::MASTER_REQUEST, Boolean $catch = true )
@@ -239,6 +239,35 @@ HttpKernelInterface::SUB_REQUEST)
+
+
+ + + + + protected + + + + + +
+ # + initSession( Symfony\Component\HttpFoundation\Request $request ) + +
+ +
+ +
diff --git a/documentation/api/class-Thelia.Model.ConfigQuery.html b/documentation/api/class-Thelia.Model.ConfigQuery.html index 2527ad18f..b3b5eff63 100644 --- a/documentation/api/class-Thelia.Model.ConfigQuery.html +++ b/documentation/api/class-Thelia.Model.ConfigQuery.html @@ -464,7 +464,7 @@ ModelCriteria
# - read( mixed $search, mixed $default ) + read( mixed $search, mixed $default = null )
diff --git a/documentation/api/class-Thelia.Model.Lang.html b/documentation/api/class-Thelia.Model.Lang.html index bf26a844a..e11a15dc1 100644 --- a/documentation/api/class-Thelia.Model.Lang.html +++ b/documentation/api/class-Thelia.Model.Lang.html @@ -477,6 +477,7 @@ BaseObject getCode(), getCreatedAt(), getId(), + getLocale(), getPeer(), getPrimaryKey(), getTitle(), @@ -496,6 +497,7 @@ BaseObject setCode(), setCreatedAt(), setId(), + setLocale(), setPrimaryKey(), setTitle(), setUpdatedAt(), @@ -535,6 +537,7 @@ BaseObject $code, $created_at, $id, + $locale, $peer, $startCopy, $title, diff --git a/documentation/api/class-Thelia.Model.LangPeer.html b/documentation/api/class-Thelia.Model.LangPeer.html index ebfb86e52..2592b4efd 100644 --- a/documentation/api/class-Thelia.Model.LangPeer.html +++ b/documentation/api/class-Thelia.Model.LangPeer.html @@ -498,6 +498,7 @@ exist in the output directory.

DATABASE_NAME, DEFAULT_STRING_FORMAT, ID, + LOCALE, NUM_COLUMNS, NUM_HYDRATE_COLUMNS, NUM_LAZY_LOAD_COLUMNS, diff --git a/documentation/api/class-Thelia.Model.LangQuery.html b/documentation/api/class-Thelia.Model.LangQuery.html index e079b8126..777f3d000 100644 --- a/documentation/api/class-Thelia.Model.LangQuery.html +++ b/documentation/api/class-Thelia.Model.LangQuery.html @@ -462,6 +462,7 @@ ModelCriteria filterByCode(), filterByCreatedAt(), filterById(), + filterByLocale(), filterByPrimaryKey(), filterByPrimaryKeys(), filterByTitle(), @@ -492,6 +493,7 @@ ModelCriteria findByCode(), findByCreatedAt(), findById(), + findByLocale(), findByTitle(), findByUpdatedAt(), findByUrl(), @@ -500,6 +502,7 @@ ModelCriteria findOneByCode(), findOneByCreatedAt(), findOneById(), + findOneByLocale(), findOneByTitle(), findOneByUpdatedAt(), findOneByUrl(), @@ -508,6 +511,7 @@ ModelCriteria groupByCode(), groupByCreatedAt(), groupById(), + groupByLocale(), groupByTitle(), groupByUpdatedAt(), groupByUrl(), @@ -517,6 +521,7 @@ ModelCriteria orderByCode(), orderByCreatedAt(), orderById(), + orderByLocale(), orderByTitle(), orderByUpdatedAt(), orderByUrl(), diff --git a/documentation/api/class-Thelia.Model.map.LangTableMap.html b/documentation/api/class-Thelia.Model.map.LangTableMap.html index d9e55e528..72532eb65 100644 --- a/documentation/api/class-Thelia.Model.map.LangTableMap.html +++ b/documentation/api/class-Thelia.Model.map.LangTableMap.html @@ -249,7 +249,7 @@ TableMap Namespace: Thelia\Model\map
Package: propel\generator\Thelia\Model\map
- Located at core/lib/Thelia/Model/map/LangTableMap.php
+ Located at core/lib/Thelia/Model/map/LangTableMap.php
@@ -267,7 +267,7 @@ TableMap
# - initialize( ) + initialize( )
@@ -306,7 +306,7 @@ initialized by this method since they are lazy loaded

# - buildRelations( ) + buildRelations( )
@@ -339,7 +339,7 @@ initialized by this method since they are lazy loaded

# - getBehaviors( ) + getBehaviors( )
diff --git a/documentation/api/class-Thelia.Model.om.BaseLang.html b/documentation/api/class-Thelia.Model.om.BaseLang.html index cb3be9c74..f4dce1ae2 100644 --- a/documentation/api/class-Thelia.Model.om.BaseLang.html +++ b/documentation/api/class-Thelia.Model.om.BaseLang.html @@ -438,7 +438,7 @@ BaseObject Namespace: Thelia\Model\om
Package: propel\generator\Thelia\Model\om
- Located at core/lib/Thelia/Model/om/BaseLang.php
+ Located at core/lib/Thelia/Model/om/BaseLang.php
@@ -456,7 +456,7 @@ BaseObject
# - getId( ) + getId( )
@@ -493,7 +493,7 @@ BaseObject
# - getTitle( ) + getTitle( )
@@ -530,7 +530,7 @@ BaseObject
# - getCode( ) + getCode( )
@@ -553,6 +553,43 @@ BaseObject +
+
+ + + + + public + string + + + + +
+ # + getLocale( ) + +
+ +

Get the [locale] column value.

+ +
+ +
@@ -567,7 +604,7 @@ BaseObject
# - getUrl( ) + getUrl( )
@@ -604,7 +641,7 @@ BaseObject
# - getByDefault( ) + getByDefault( )
@@ -641,7 +678,7 @@ BaseObject
# - getCreatedAt( string $format = 'Y-m-d H:i:s' ) + getCreatedAt( string $format = 'Y-m-d H:i:s' )
@@ -689,7 +726,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - getUpdatedAt( string $format = 'Y-m-d H:i:s' ) + getUpdatedAt( string $format = 'Y-m-d H:i:s' )
@@ -737,7 +774,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setId( integer $v ) + setId( integer $v )
@@ -779,7 +816,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setTitle( string $v ) + setTitle( string $v )
@@ -821,7 +858,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setCode( string $v ) + setCode( string $v )
@@ -849,6 +886,48 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
+
+
+ + + + + public + Thelia\Model\Lang + + + + +
+ # + setLocale( string $v ) + +
+ +

Set the value of [locale] column.

+ +
+ +
@@ -863,7 +942,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setUrl( string $v ) + setUrl( string $v )
@@ -905,7 +984,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setByDefault( integer $v ) + setByDefault( integer $v )
@@ -947,7 +1026,7 @@ if column is null, and 0 if column value is 0000-00-00 00:00:00
# - setCreatedAt( mixed $v ) + setCreatedAt( mixed $v )
@@ -992,7 +1071,7 @@ null.
# - setUpdatedAt( mixed $v ) + setUpdatedAt( mixed $v )
@@ -1037,7 +1116,7 @@ null.
# - hasOnlyDefaultValues( ) + hasOnlyDefaultValues( )
@@ -1079,7 +1158,7 @@ an object is both modified _and_ has some values set which are non-default.

# - hydrate( array $row, integer $startcol = 0, boolean $rehydrate = false ) + hydrate( array $row, integer $startcol = 0, boolean $rehydrate = false )
@@ -1137,7 +1216,7 @@ with.
# - ensureConsistency( ) + ensureConsistency( )
@@ -1182,7 +1261,7 @@ in case your model changes.

# - reload( boolean $deep = false, PropelPDO $con = null ) + reload( boolean $deep = false, PropelPDO $con = null )
@@ -1231,7 +1310,7 @@ set.

# - delete( PropelPDO $con = null ) + delete( PropelPDO $con = null )
@@ -1279,7 +1358,7 @@ set.

# - save( PropelPDO $con = null ) + save( PropelPDO $con = null )
@@ -1335,7 +1414,7 @@ save() operations.
# - doSave( PropelPDO $con ) + doSave( PropelPDO $con )
@@ -1389,7 +1468,7 @@ save() operations.
# - doInsert( PropelPDO $con ) + doInsert( PropelPDO $con )
@@ -1435,7 +1514,7 @@ save() operations.
# - doUpdate( PropelPDO $con ) + doUpdate( PropelPDO $con )
@@ -1477,7 +1556,7 @@ save() operations.
# - getValidationFailures( ) + getValidationFailures( )
@@ -1520,7 +1599,7 @@ validate().

# - validate( mixed $columns = null ) + validate( mixed $columns = null )
@@ -1572,7 +1651,7 @@ columns are validated.

# - doValidate( array $columns = null ) + doValidate( array $columns = null )
@@ -1620,7 +1699,7 @@ validations pass; array of ValidationFailed objets otherwise.
# - getByName( string $name, string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME ) + getByName( string $name, string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME )
@@ -1666,7 +1745,7 @@ BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. Defaults to BasePeer::TYPE_PHPNAME
# - getByPosition( integer $pos ) + getByPosition( integer $pos )
@@ -1710,7 +1789,7 @@ Zero-based.

# - toArray( string $keyType = Thelia\Model\om\BasePeer::TYPE_PHPNAME, boolean $includeLazyLoadColumns = true, array $alreadyDumpedObjects = array() ) + toArray( string $keyType = Thelia\Model\om\BasePeer::TYPE_PHPNAME, boolean $includeLazyLoadColumns = true, array $alreadyDumpedObjects = array() )
@@ -1762,7 +1841,7 @@ Defaults to true.
# - setByName( string $name, mixed $value, string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME ) + setByName( string $name, mixed $value, string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME )
@@ -1806,7 +1885,7 @@ BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. Defaults to BasePeer::TYPE_PHPNAME
# - setByPosition( integer $pos, mixed $value ) + setByPosition( integer $pos, mixed $value )
@@ -1848,7 +1927,7 @@ Zero-based.

# - fromArray( array $arr, string $keyType = Thelia\Model\om\BasePeer::TYPE_PHPNAME ) + fromArray( array $arr, string $keyType = Thelia\Model\om\BasePeer::TYPE_PHPNAME )
@@ -1898,7 +1977,7 @@ default key type is the column's BasePeer::TYPE_PHPNAME

# - buildCriteria( ) + buildCriteria( )
@@ -1937,7 +2016,7 @@ object.

# - buildPkeyCriteria( ) + buildPkeyCriteria( )
@@ -1977,7 +2056,7 @@ of whether or not they have been modified.

# - getPrimaryKey( ) + getPrimaryKey( )
@@ -2014,7 +2093,7 @@ of whether or not they have been modified.

# - setPrimaryKey( integer $key ) + setPrimaryKey( integer $key )
@@ -2052,7 +2131,7 @@ of whether or not they have been modified.

# - isPrimaryKeyNull( ) + isPrimaryKeyNull( )
@@ -2089,7 +2168,7 @@ of whether or not they have been modified.

# - copyInto( object $copyObj, boolean $deepCopy = false, boolean $makeNew = true ) + copyInto( object $copyObj, boolean $deepCopy = false, boolean $makeNew = true )
@@ -2138,7 +2217,7 @@ referrers) objects.

# - copy( boolean $deepCopy = false ) + copy( boolean $deepCopy = false )
@@ -2191,7 +2270,7 @@ referrers) objects.

# - getPeer( ) + getPeer( )
@@ -2233,7 +2312,7 @@ behavior.

# - clear( ) + clear( )
@@ -2266,7 +2345,7 @@ behavior.

# - clearAllReferences( boolean $deep = false ) + clearAllReferences( boolean $deep = false )
@@ -2310,7 +2389,7 @@ when using Propel in certain daemon or large-volumne/high-memory operations.

# - __toString( ) + __toString( )
@@ -2347,7 +2426,7 @@ when using Propel in certain daemon or large-volumne/high-memory operations.

# - isAlreadyInSave( ) + isAlreadyInSave( )
@@ -2384,7 +2463,7 @@ when using Propel in certain daemon or large-volumne/high-memory operations.

# - keepUpdateDateUnchanged( ) + keepUpdateDateUnchanged( )
@@ -2588,6 +2667,33 @@ on a class that calling code may not be able to identify.

The value for the code field.

+
+
+ + + + protected + string + + + + $locale + + +
+ # + +
+ +

The value for the locale field.

+ +
+ +
@@ -2598,7 +2704,7 @@ on a class that calling code may not be able to identify.

- $url + $url
@@ -2625,7 +2731,7 @@ on a class that calling code may not be able to identify.

- $by_default + $by_default
@@ -2652,7 +2758,7 @@ on a class that calling code may not be able to identify.

- $created_at + $created_at
@@ -2679,7 +2785,7 @@ on a class that calling code may not be able to identify.

- $updated_at + $updated_at
@@ -2706,7 +2812,7 @@ on a class that calling code may not be able to identify.

- $alreadyInSave + $alreadyInSave false
@@ -2735,7 +2841,7 @@ object which falls in this transaction.

- $alreadyInValidation + $alreadyInValidation false
@@ -2764,7 +2870,7 @@ another object which falls in this transaction.

- $validationFailures + $validationFailures array()
diff --git a/documentation/api/class-Thelia.Model.om.BaseLangPeer.html b/documentation/api/class-Thelia.Model.om.BaseLangPeer.html index ba0c908b0..a06929e09 100644 --- a/documentation/api/class-Thelia.Model.om.BaseLangPeer.html +++ b/documentation/api/class-Thelia.Model.om.BaseLangPeer.html @@ -424,7 +424,7 @@ table.

Namespace: Thelia\Model\om
Package: propel\generator\Thelia\Model\om
- Located at core/lib/Thelia/Model/om/BaseLangPeer.php
+ Located at core/lib/Thelia/Model/om/BaseLangPeer.php
@@ -442,7 +442,7 @@ table.

# - translateFieldName( string $name, string $fromType, string $toType ) + translateFieldName( string $name, string $fromType, string $toType )
@@ -494,7 +494,7 @@ BasePeer::TYPE_NUM
# - getFieldNames( string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME ) + getFieldNames( string $type = Thelia\Model\om\BasePeer::TYPE_PHPNAME )
@@ -542,7 +542,7 @@ BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
# - alias( string $alias, string $column ) + alias( string $alias, string $column )
@@ -597,7 +597,7 @@ class="php-quote">"alias1", TablePeer::PRIMARY_KEY_COLUMN), Tab
# - addSelectColumns( Criteria $criteria, string $alias = null ) + addSelectColumns( Criteria $criteria, string $alias = null )
@@ -645,7 +645,7 @@ PropelException.
# - doCount( Criteria $criteria, boolean $distinct = false, PropelPDO $con = null ) + doCount( Criteria $criteria, boolean $distinct = false, PropelPDO $con = null )
@@ -692,7 +692,7 @@ Criteria->setDistinct() instead.
# - doSelectOne( Criteria $criteria, PropelPDO $con = null ) + doSelectOne( Criteria $criteria, PropelPDO $con = null )
@@ -741,7 +741,7 @@ PropelException.
# - doSelect( Criteria $criteria, PropelPDO $con = null ) + doSelect( Criteria $criteria, PropelPDO $con = null )
@@ -790,7 +790,7 @@ PropelException.
# - doSelectStmt( Criteria $criteria, PropelPDO $con = null ) + doSelectStmt( Criteria $criteria, PropelPDO $con = null )
@@ -848,7 +848,7 @@ PropelException.
# - addInstanceToPool( Thelia\Model\Lang $obj, string $key = null ) + addInstanceToPool( Thelia\Model\Lang $obj, string $key = null )
@@ -895,7 +895,7 @@ already calculated externally).
# - removeInstanceFromPool( mixed $value ) + removeInstanceFromPool( mixed $value )
@@ -943,7 +943,7 @@ exist.

# - getInstanceFromPool( string $key ) + getInstanceFromPool( string $key )
@@ -996,7 +996,7 @@ pooling has been disabled.
# - clearInstancePool( ) + clearInstancePool( )
@@ -1029,7 +1029,7 @@ pooling has been disabled.
# - clearRelatedInstancePool( ) + clearRelatedInstancePool( )
@@ -1064,7 +1064,7 @@ foreign key with ON DELETE CASCADE

# - getPrimaryKeyHashFromRow( array $row, integer $startcol = 0 ) + getPrimaryKeyHashFromRow( array $row, integer $startcol = 0 )
@@ -1115,7 +1115,7 @@ are all null.
# - getPrimaryKeyFromRow( array $row, integer $startcol = 0 ) + getPrimaryKeyFromRow( array $row, integer $startcol = 0 )
@@ -1165,7 +1165,7 @@ returned.

# - populateObjects( PDOStatement $stmt ) + populateObjects( PDOStatement $stmt )
@@ -1205,7 +1205,7 @@ PropelException.
# - populateObject( array $row, integer $startcol = 0 ) + populateObject( array $row, integer $startcol = 0 )
@@ -1256,7 +1256,7 @@ PropelException.
# - getTableMap( ) + getTableMap( )
@@ -1300,7 +1300,7 @@ PropelException.
# - buildTableMap( ) + buildTableMap( )
@@ -1333,7 +1333,7 @@ PropelException.
# - getOMClass( ) + getOMClass( )
@@ -1370,7 +1370,7 @@ PropelException.
# - doInsert( mixed $values, PropelPDO $con = null ) + doInsert( mixed $values, PropelPDO $con = null )
@@ -1420,7 +1420,7 @@ PropelException.
# - doUpdate( mixed $values, PropelPDO $con = null ) + doUpdate( mixed $values, PropelPDO $con = null )
@@ -1471,7 +1471,7 @@ PropelException.
# - doDeleteAll( PropelPDO $con = null ) + doDeleteAll( PropelPDO $con = null )
@@ -1517,7 +1517,7 @@ PropelException.
# - doDelete( mixed $values, PropelPDO $con = null ) + doDelete( mixed $values, PropelPDO $con = null )
@@ -1571,7 +1571,7 @@ PropelException.
# - doValidate( Thelia\Model\Lang $obj, mixed $cols = null ) + doValidate( Thelia\Model\Lang $obj, mixed $cols = null )
@@ -1621,7 +1621,7 @@ are validated.

# - retrieveByPK( integer $pk, PropelPDO $con = null ) + retrieveByPK( integer $pk, PropelPDO $con = null )
@@ -1665,7 +1665,7 @@ are validated.

# - retrieveByPKs( array $pks, PropelPDO $con = null ) + retrieveByPKs( array $pks, PropelPDO $con = null )
@@ -1816,7 +1816,7 @@ PropelException.
NUM_COLUMNS - 7 + 8
# @@ -1864,7 +1864,7 @@ PropelException.
NUM_HYDRATE_COLUMNS - 7 + 8
# @@ -1951,6 +1951,30 @@ PropelException.

the column name for the CODE field

+
+
+ + + + string + + LOCALE + + 'lang.LOCALE' +
+ # + +
+ +

the column name for the LOCALE field

+ +
+ +
@@ -1958,7 +1982,7 @@ PropelException.
string - URL + URL 'lang.URL'
@@ -1982,7 +2006,7 @@ PropelException.
string - BY_DEFAULT + BY_DEFAULT 'lang.BY_DEFAULT'
@@ -2006,7 +2030,7 @@ PropelException.
string - CREATED_AT + CREATED_AT 'lang.CREATED_AT'
@@ -2030,7 +2054,7 @@ PropelException.
string - UPDATED_AT + UPDATED_AT 'lang.UPDATED_AT'
@@ -2054,7 +2078,7 @@ PropelException.
string - DEFAULT_STRING_FORMAT + DEFAULT_STRING_FORMAT 'YAML'
@@ -2088,7 +2112,7 @@ PropelException.
- $instances + $instances array()
@@ -2119,15 +2143,15 @@ queries.

- $fieldNames + $fieldNames array ( - BasePeer::TYPE_PHPNAME => array ('Id', 'Title', 'Code', 'Url', 'ByDefault', 'CreatedAt', 'UpdatedAt', ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'title', 'code', 'url', 'byDefault', 'createdAt', 'updatedAt', ), - BasePeer::TYPE_COLNAME => array (LangPeer::ID, LangPeer::TITLE, LangPeer::CODE, LangPeer::URL, LangPeer::BY_DEFAULT, LangPeer::CREATED_AT, LangPeer::UPDATED_AT, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID', 'TITLE', 'CODE', 'URL', 'BY_DEFAULT', 'CREATED_AT', 'UPDATED_AT', ), - BasePeer::TYPE_FIELDNAME => array ('id', 'title', 'code', 'url', 'by_default', 'created_at', 'updated_at', ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) + BasePeer::TYPE_PHPNAME => array ('Id', 'Title', 'Code', 'Locale', 'Url', 'ByDefault', 'CreatedAt', 'UpdatedAt', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('id', 'title', 'code', 'locale', 'url', 'byDefault', 'createdAt', 'updatedAt', ), + BasePeer::TYPE_COLNAME => array (LangPeer::ID, LangPeer::TITLE, LangPeer::CODE, LangPeer::LOCALE, LangPeer::URL, LangPeer::BY_DEFAULT, LangPeer::CREATED_AT, LangPeer::UPDATED_AT, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'TITLE', 'CODE', 'LOCALE', 'URL', 'BY_DEFAULT', 'CREATED_AT', 'UPDATED_AT', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'title', 'code', 'locale', 'url', 'by_default', 'created_at', 'updated_at', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) )
# @@ -2156,15 +2180,15 @@ LangPeer::$fieldNames[LangPeer::TYPE_PHPNAME][0] = 'Id'

- $fieldKeys + $fieldKeys array ( - BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Title' => 1, 'Code' => 2, 'Url' => 3, 'ByDefault' => 4, 'CreatedAt' => 5, 'UpdatedAt' => 6, ), - BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'title' => 1, 'code' => 2, 'url' => 3, 'byDefault' => 4, 'createdAt' => 5, 'updatedAt' => 6, ), - BasePeer::TYPE_COLNAME => array (LangPeer::ID => 0, LangPeer::TITLE => 1, LangPeer::CODE => 2, LangPeer::URL => 3, LangPeer::BY_DEFAULT => 4, LangPeer::CREATED_AT => 5, LangPeer::UPDATED_AT => 6, ), - BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'TITLE' => 1, 'CODE' => 2, 'URL' => 3, 'BY_DEFAULT' => 4, 'CREATED_AT' => 5, 'UPDATED_AT' => 6, ), - BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'title' => 1, 'code' => 2, 'url' => 3, 'by_default' => 4, 'created_at' => 5, 'updated_at' => 6, ), - BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, ) + BasePeer::TYPE_PHPNAME => array ('Id' => 0, 'Title' => 1, 'Code' => 2, 'Locale' => 3, 'Url' => 4, 'ByDefault' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('id' => 0, 'title' => 1, 'code' => 2, 'locale' => 3, 'url' => 4, 'byDefault' => 5, 'createdAt' => 6, 'updatedAt' => 7, ), + BasePeer::TYPE_COLNAME => array (LangPeer::ID => 0, LangPeer::TITLE => 1, LangPeer::CODE => 2, LangPeer::LOCALE => 3, LangPeer::URL => 4, LangPeer::BY_DEFAULT => 5, LangPeer::CREATED_AT => 6, LangPeer::UPDATED_AT => 7, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'TITLE' => 1, 'CODE' => 2, 'LOCALE' => 3, 'URL' => 4, 'BY_DEFAULT' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'title' => 1, 'code' => 2, 'locale' => 3, 'url' => 4, 'by_default' => 5, 'created_at' => 6, 'updated_at' => 7, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, ) )
# diff --git a/documentation/api/class-Thelia.Model.om.BaseLangQuery.html b/documentation/api/class-Thelia.Model.om.BaseLangQuery.html index 199588e48..46e097279 100644 --- a/documentation/api/class-Thelia.Model.om.BaseLangQuery.html +++ b/documentation/api/class-Thelia.Model.om.BaseLangQuery.html @@ -436,7 +436,7 @@ ModelCriteria Namespace: Thelia\Model\om
Package: propel\generator\Thelia\Model\om
- Located at core/lib/Thelia/Model/om/BaseLangQuery.php
+ Located at core/lib/Thelia/Model/om/BaseLangQuery.php
@@ -454,7 +454,7 @@ ModelCriteria
# - __construct( string $dbName = 'thelia', string $modelName = 'Thelia\\Model\\Lang', string $modelAlias = null ) + __construct( string $dbName = 'thelia', string $modelName = 'Thelia\\Model\\Lang', string $modelAlias = null )
@@ -496,7 +496,7 @@ ModelCriteria
# - create( string $modelAlias = null, Thelia\Model\LangQuery|Criteria $criteria = null ) + create( string $modelAlias = null, Thelia\Model\LangQuery|Criteria $criteria = null )
@@ -540,7 +540,7 @@ ModelCriteria
# - findPk( mixed $key, PropelPDO $con = null ) + findPk( mixed $key, PropelPDO $con = null )
@@ -592,7 +592,7 @@ class="php-var">$con);
# - findPkSimple( mixed $key, PropelPDO $con ) + findPkSimple( mixed $key, PropelPDO $con )
@@ -642,7 +642,7 @@ the object formatter by using generated code.

# - findPkComplex( mixed $key, PropelPDO $con ) + findPkComplex( mixed $key, PropelPDO $con )
@@ -686,7 +686,7 @@ the object formatter by using generated code.

# - findPks( array $keys, PropelPDO $con = null ) + findPks( array $keys, PropelPDO $con = null )
@@ -746,7 +746,7 @@ class="php-var">$con);
# - filterByPrimaryKey( mixed $key ) + filterByPrimaryKey( mixed $key )
@@ -788,7 +788,7 @@ class="php-var">$con);
# - filterByPrimaryKeys( array $keys ) + filterByPrimaryKeys( array $keys )
@@ -830,7 +830,7 @@ class="php-var">$con);
# - filterById( mixed $id = null, string $comparison = null ) + filterById( mixed $id = null, string $comparison = null )
@@ -895,7 +895,7 @@ Criteria::EQUAL
# - filterByTitle( string $title = null, string $comparison = null ) + filterByTitle( string $title = null, string $comparison = null )
@@ -952,7 +952,7 @@ Criteria::EQUAL
# - filterByCode( string $code = null, string $comparison = null ) + filterByCode( string $code = null, string $comparison = null )
@@ -995,6 +995,63 @@ Criteria::EQUAL +
+
+ + + + + public + Thelia\Model\LangQuery + + + + +
+ # + filterByLocale( string $locale = null, string $comparison = null ) + +
+ +

Filter the query on the locale column

+ +
+ +
@@ -1009,7 +1066,7 @@ Criteria::EQUAL
# - filterByUrl( string $url = null, string $comparison = null ) + filterByUrl( string $url = null, string $comparison = null )
@@ -1066,7 +1123,7 @@ Criteria::EQUAL
# - filterByByDefault( mixed $byDefault = null, string $comparison = null ) + filterByByDefault( mixed $byDefault = null, string $comparison = null )
@@ -1131,7 +1188,7 @@ Criteria::EQUAL
# - filterByCreatedAt( mixed $createdAt = null, string $comparison = null ) + filterByCreatedAt( mixed $createdAt = null, string $comparison = null )
@@ -1197,7 +1254,7 @@ Criteria::EQUAL
# - filterByUpdatedAt( mixed $updatedAt = null, string $comparison = null ) + filterByUpdatedAt( mixed $updatedAt = null, string $comparison = null )
@@ -1263,7 +1320,7 @@ Criteria::EQUAL
# - prune( Thelia\Model\Lang $lang = null ) + prune( Thelia\Model\Lang $lang = null )
@@ -1305,7 +1362,7 @@ Criteria::EQUAL
# - recentlyUpdated( integer $nbDays = 7 ) + recentlyUpdated( integer $nbDays = 7 )
@@ -1347,7 +1404,7 @@ Criteria::EQUAL
# - lastUpdatedFirst( ) + lastUpdatedFirst( )
@@ -1384,7 +1441,7 @@ Criteria::EQUAL
# - firstUpdatedFirst( ) + firstUpdatedFirst( )
@@ -1421,7 +1478,7 @@ Criteria::EQUAL
# - recentlyCreated( integer $nbDays = 7 ) + recentlyCreated( integer $nbDays = 7 )
@@ -1463,7 +1520,7 @@ Criteria::EQUAL
# - lastCreatedFirst( ) + lastCreatedFirst( )
@@ -1500,7 +1557,7 @@ Criteria::EQUAL
# - firstCreatedFirst( ) + firstCreatedFirst( )
@@ -1655,6 +1712,48 @@ Criteria::EQUAL +
+
+ + + + + public + Thelia\Model\LangQuery + + + + +
+ # + orderByLocale( mixed $order = Thelia\Model\om\Criteria::ASC ) + +
+ +

Order by the locale column

+ +
+ +
@@ -1669,7 +1768,7 @@ Criteria::EQUAL
# - orderByUrl( mixed $order = Thelia\Model\om\Criteria::ASC ) + orderByUrl( mixed $order = Thelia\Model\om\Criteria::ASC )
@@ -1711,7 +1810,7 @@ Criteria::EQUAL
# - orderByByDefault( mixed $order = Thelia\Model\om\Criteria::ASC ) + orderByByDefault( mixed $order = Thelia\Model\om\Criteria::ASC )
@@ -1753,7 +1852,7 @@ Criteria::EQUAL
# - orderByCreatedAt( mixed $order = Thelia\Model\om\Criteria::ASC ) + orderByCreatedAt( mixed $order = Thelia\Model\om\Criteria::ASC )
@@ -1795,7 +1894,7 @@ Criteria::EQUAL
# - orderByUpdatedAt( mixed $order = Thelia\Model\om\Criteria::ASC ) + orderByUpdatedAt( mixed $order = Thelia\Model\om\Criteria::ASC )
@@ -1837,7 +1936,7 @@ Criteria::EQUAL
# - groupById( ) + groupById( )
@@ -1874,7 +1973,7 @@ Criteria::EQUAL
# - groupByTitle( ) + groupByTitle( )
@@ -1911,7 +2010,7 @@ Criteria::EQUAL
# - groupByCode( ) + groupByCode( )
@@ -1934,6 +2033,43 @@ Criteria::EQUAL +
+
+ + + + + public + Thelia\Model\LangQuery + + + + +
+ # + groupByLocale( ) + +
+ +

Group by the locale column

+ +
+ +
@@ -1948,7 +2084,7 @@ Criteria::EQUAL
# - groupByUrl( ) + groupByUrl( )
@@ -1985,7 +2121,7 @@ Criteria::EQUAL
# - groupByByDefault( ) + groupByByDefault( )
@@ -2022,7 +2158,7 @@ Criteria::EQUAL
# - groupByCreatedAt( ) + groupByCreatedAt( )
@@ -2059,7 +2195,7 @@ Criteria::EQUAL
# - groupByUpdatedAt( ) + groupByUpdatedAt( )
@@ -2096,7 +2232,7 @@ Criteria::EQUAL
# - leftJoin( mixed $relation = ) + leftJoin( mixed $relation = )
@@ -2138,7 +2274,7 @@ Criteria::EQUAL
# - rightJoin( mixed $relation = ) + rightJoin( mixed $relation = )
@@ -2180,7 +2316,7 @@ Criteria::EQUAL
# - innerJoin( mixed $relation = ) + innerJoin( mixed $relation = )
@@ -2222,7 +2358,7 @@ Criteria::EQUAL
# - findOne( PropelPDO $con = null ) + findOne( PropelPDO $con = null )
@@ -2264,7 +2400,7 @@ Criteria::EQUAL
# - findOneOrCreate( PropelPDO $con = null ) + findOneOrCreate( PropelPDO $con = null )
@@ -2308,7 +2444,7 @@ the query conditions when no match is found

# - findOneById( integer $id = ) + findOneById( integer $id = )
@@ -2350,7 +2486,7 @@ the query conditions when no match is found

# - findOneByTitle( string $title = ) + findOneByTitle( string $title = )
@@ -2392,7 +2528,7 @@ the query conditions when no match is found

# - findOneByCode( string $code = ) + findOneByCode( string $code = )
@@ -2420,6 +2556,48 @@ the query conditions when no match is found

+
+
+ + + + + public + Thelia\Model\Lang + + + + +
+ # + findOneByLocale( string $locale = ) + +
+ +

Return the first Lang filtered by the locale column

+ +
+ +
@@ -2434,7 +2612,7 @@ the query conditions when no match is found

# - findOneByUrl( string $url = ) + findOneByUrl( string $url = )
@@ -2476,7 +2654,7 @@ the query conditions when no match is found

# - findOneByByDefault( integer $by_default = ) + findOneByByDefault( integer $by_default = )
@@ -2518,7 +2696,7 @@ the query conditions when no match is found

# - findOneByCreatedAt( string $created_at = ) + findOneByCreatedAt( string $created_at = )
@@ -2560,7 +2738,7 @@ the query conditions when no match is found

# - findOneByUpdatedAt( string $updated_at = ) + findOneByUpdatedAt( string $updated_at = )
@@ -2602,7 +2780,7 @@ the query conditions when no match is found

# - findById( integer $id = ) + findById( integer $id = )
@@ -2644,7 +2822,7 @@ the query conditions when no match is found

# - findByTitle( string $title = ) + findByTitle( string $title = )
@@ -2686,7 +2864,7 @@ the query conditions when no match is found

# - findByCode( string $code = ) + findByCode( string $code = )
@@ -2714,6 +2892,48 @@ the query conditions when no match is found

+
+
+ + + + + public + array + + + + +
+ # + findByLocale( string $locale = ) + +
+ +

Return Lang objects filtered by the locale column

+ +
+ +
@@ -2728,7 +2948,7 @@ the query conditions when no match is found

# - findByUrl( string $url = ) + findByUrl( string $url = )
@@ -2770,7 +2990,7 @@ the query conditions when no match is found

# - findByByDefault( integer $by_default = ) + findByByDefault( integer $by_default = )
@@ -2812,7 +3032,7 @@ the query conditions when no match is found

# - findByCreatedAt( string $created_at = ) + findByCreatedAt( string $created_at = )
@@ -2854,7 +3074,7 @@ the query conditions when no match is found

# - findByUpdatedAt( string $updated_at = ) + findByUpdatedAt( string $updated_at = )
diff --git a/documentation/api/source-class-Thelia.Action.BaseAction.html b/documentation/api/source-class-Thelia.Action.BaseAction.html index 99a3d3caa..9f6978104 100644 --- a/documentation/api/source-class-Thelia.Action.BaseAction.html +++ b/documentation/api/source-class-Thelia.Action.BaseAction.html @@ -145,37 +145,38 @@ 26: use Symfony\Component\EventDispatcher\EventDispatcherInterface; 27: 28: /** -29: * -30: * +29: * +30: * 31: * @author Manuel Raynaud <mraynaud@openstudio.fr> 32: */ 33: -34: abstract class BaseAction +34: abstract class BaseAction 35: { 36: /** 37: * 38: * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface 39: */ 40: protected $dispatcher; -41: +41: 42: /** -43: * +43: * 44: * @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher 45: */ -46: public function __construct(EventDispatcherInterface $dispatcher) +46: public function __construct(EventDispatcherInterface $dispatcher) 47: { 48: $this->dispatcher = $dispatcher; 49: } -50: +50: 51: /** -52: * +52: * 53: * @return \Symfony\Component\EventDispatcher\EventDispatcherInterface 54: */ 55: public function getDispatcher() 56: { 57: return $this->dispatcher; 58: } -59: } +59: } +60: