diff --git a/composer.lock b/composer.lock
index c10b85655..efa62a9f2 100755
--- a/composer.lock
+++ b/composer.lock
@@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
],
- "hash": "6f8ad7a37d85013a8c8f99611c0f1b84",
+ "hash": "458aeccc06b7394d7653a9063b6fd981",
"packages": [
{
"name": "ezyang/htmlpurifier",
@@ -128,7 +128,7 @@
"authors": [
{
"name": "Anthony Ferrara",
- "email": "ircmaxell@ircmaxell.com",
+ "email": "ircmaxell@php.net",
"homepage": "http://blog.ircmaxell.com"
}
],
@@ -217,12 +217,12 @@
"source": {
"type": "git",
"url": "https://github.com/leafo/lessphp.git",
- "reference": "v0.4.0"
+ "reference": "51f3f06f0fe78a722dabfd14578444bdd078d9de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/leafo/lessphp/zipball/v0.4.0",
- "reference": "v0.4.0",
+ "url": "https://api.github.com/repos/leafo/lessphp/zipball/51f3f06f0fe78a722dabfd14578444bdd078d9de",
+ "reference": "51f3f06f0fe78a722dabfd14578444bdd078d9de",
"shasum": ""
},
"type": "library",
@@ -258,26 +258,26 @@
"source": {
"type": "git",
"url": "https://github.com/propelorm/Propel2.git",
- "reference": "2.0.0-alpha1"
+ "reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/propelorm/Propel2/zipball/2.0.0-alpha1",
- "reference": "2.0.0-alpha1",
+ "url": "https://api.github.com/repos/propelorm/Propel2/zipball/3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184",
+ "reference": "3b9ea45a6e1b9fb3903cb910a31fbbac4a66c184",
"shasum": ""
},
"require": {
"php": ">=5.4",
- "psr/log": ">=1.0,<2.0",
- "symfony/console": ">=2.2,<3.0",
- "symfony/filesystem": ">=2.2,<3.0",
- "symfony/finder": ">=2.2,<3.0",
- "symfony/validator": ">=2.2,<3.0",
- "symfony/yaml": ">=2.2,<3.0"
+ "psr/log": "~1.0",
+ "symfony/console": "~2.2",
+ "symfony/filesystem": "~2.2",
+ "symfony/finder": "~2.2",
+ "symfony/validator": "~2.2",
+ "symfony/yaml": "~2.2"
},
"require-dev": {
- "behat/behat": ">=2.4,<3.0",
- "monolog/monolog": ">=1.3,<2.0",
+ "behat/behat": "~2.4",
+ "monolog/monolog": "~1.3",
"phpunit/phpunit": "3.7.*"
},
"suggest": {
@@ -540,17 +540,17 @@
},
{
"name": "symfony/class-loader",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/ClassLoader",
"source": {
"type": "git",
"url": "https://github.com/symfony/ClassLoader.git",
- "reference": "v2.2.5"
+ "reference": "827c54ee9827f6de5afe53324cdbe47f017c0cba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/827c54ee9827f6de5afe53324cdbe47f017c0cba",
+ "reference": "827c54ee9827f6de5afe53324cdbe47f017c0cba",
"shasum": ""
},
"require": {
@@ -586,21 +586,21 @@
],
"description": "Symfony ClassLoader Component",
"homepage": "http://symfony.com",
- "time": "2013-05-06 20:02:13"
+ "time": "2013-08-09 07:16:43"
},
{
"name": "symfony/config",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
- "reference": "v2.2.5"
+ "reference": "4ab8ad0c0f4bb52b0e7fb12d63b81892fb7f697a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Config/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/Config/zipball/4ab8ad0c0f4bb52b0e7fb12d63b81892fb7f697a",
+ "reference": "4ab8ad0c0f4bb52b0e7fb12d63b81892fb7f697a",
"shasum": ""
},
"require": {
@@ -637,17 +637,17 @@
},
{
"name": "symfony/console",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Console",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "v2.2.5"
+ "reference": "b9ed9d61ff84296c9ace5ac333c15e6f35062eeb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/b9ed9d61ff84296c9ace5ac333c15e6f35062eeb",
+ "reference": "b9ed9d61ff84296c9ace5ac333c15e6f35062eeb",
"shasum": ""
},
"require": {
@@ -680,21 +680,21 @@
],
"description": "Symfony Console Component",
"homepage": "http://symfony.com",
- "time": "2013-07-08 14:34:53"
+ "time": "2013-08-17 16:29:09"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "v2.2.5"
+ "reference": "434b31fe8548e0354d5f93b455d8927481ddfc6f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/434b31fe8548e0354d5f93b455d8927481ddfc6f",
+ "reference": "434b31fe8548e0354d5f93b455d8927481ddfc6f",
"shasum": ""
},
"require": {
@@ -739,17 +739,17 @@
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/EventDispatcher",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "v2.2.5"
+ "reference": "45c43ffa186a0473c71a947981e43e025cd93c87"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/45c43ffa186a0473c71a947981e43e025cd93c87",
+ "reference": "45c43ffa186a0473c71a947981e43e025cd93c87",
"shasum": ""
},
"require": {
@@ -793,7 +793,7 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
@@ -840,17 +840,17 @@
},
{
"name": "symfony/finder",
- "version": "v2.3.3",
+ "version": "v2.3.4",
"target-dir": "Symfony/Component/Finder",
"source": {
"type": "git",
"url": "https://github.com/symfony/Finder.git",
- "reference": "v2.3.3"
+ "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Finder/zipball/v2.3.3",
- "reference": "v2.3.3",
+ "url": "https://api.github.com/repos/symfony/Finder/zipball/4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
+ "reference": "4a0fee5b86f5bbd9dfdc11ec124eba2915737ce1",
"shasum": ""
},
"require": {
@@ -883,21 +883,21 @@
],
"description": "Symfony Finder Component",
"homepage": "http://symfony.com",
- "time": "2013-07-21 12:12:18"
+ "time": "2013-08-13 20:18:00"
},
{
"name": "symfony/form",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Form",
"source": {
"type": "git",
"url": "https://github.com/symfony/Form.git",
- "reference": "v2.2.5"
+ "reference": "33e3fcb6ca3cefe43ab22dcb8bee5ea039033a88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Form/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/Form/zipball/33e3fcb6ca3cefe43ab22dcb8bee5ea039033a88",
+ "reference": "33e3fcb6ca3cefe43ab22dcb8bee5ea039033a88",
"shasum": ""
},
"require": {
@@ -942,21 +942,21 @@
],
"description": "Symfony Form Component",
"homepage": "http://symfony.com",
- "time": "2013-08-02 13:12:51"
+ "time": "2013-08-25 11:59:08"
},
{
"name": "symfony/http-foundation",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/HttpFoundation",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpFoundation.git",
- "reference": "v2.2.5"
+ "reference": "9402ff009d4f1ee63e83e8f2262993a7c2a3beea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/9402ff009d4f1ee63e83e8f2262993a7c2a3beea",
+ "reference": "9402ff009d4f1ee63e83e8f2262993a7c2a3beea",
"shasum": ""
},
"require": {
@@ -992,21 +992,21 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com",
- "time": "2013-08-07 14:00:53"
+ "time": "2013-08-25 18:21:55"
},
{
"name": "symfony/http-kernel",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/HttpKernel",
"source": {
"type": "git",
"url": "https://github.com/symfony/HttpKernel.git",
- "reference": "v2.2.5"
+ "reference": "080dea28df16aed1fbc7aeb08a1dcb10d7ab5299"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/080dea28df16aed1fbc7aeb08a1dcb10d7ab5299",
+ "reference": "080dea28df16aed1fbc7aeb08a1dcb10d7ab5299",
"shasum": ""
},
"require": {
@@ -1062,27 +1062,26 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "http://symfony.com",
- "time": "2013-08-07 15:57:43"
+ "time": "2013-08-26 19:27:24"
},
{
"name": "symfony/icu",
- "version": "v1.2.0",
+ "version": "v1.0.0",
"target-dir": "Symfony/Component/Icu",
"source": {
"type": "git",
"url": "https://github.com/symfony/Icu.git",
- "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72"
+ "reference": "v1.0.0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
- "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72",
+ "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.0.0",
+ "reference": "v1.0.0",
"shasum": ""
},
"require": {
- "lib-icu": ">=4.4",
"php": ">=5.3.3",
- "symfony/intl": "~2.3"
+ "symfony/intl": ">=2.3,<3.0"
},
"type": "library",
"autoload": {
@@ -1110,21 +1109,21 @@
"icu",
"intl"
],
- "time": "2013-06-03 18:32:58"
+ "time": "2013-06-03 18:32:07"
},
{
"name": "symfony/intl",
- "version": "v2.3.3",
+ "version": "v2.3.4",
"target-dir": "Symfony/Component/Intl",
"source": {
"type": "git",
"url": "https://github.com/symfony/Intl.git",
- "reference": "v2.3.3"
+ "reference": "ebbcf7e3dab5185b4b24c961431e302a0ffb66ec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Intl/zipball/v2.3.3",
- "reference": "v2.3.3",
+ "url": "https://api.github.com/repos/symfony/Intl/zipball/ebbcf7e3dab5185b4b24c961431e302a0ffb66ec",
+ "reference": "ebbcf7e3dab5185b4b24c961431e302a0ffb66ec",
"shasum": ""
},
"require": {
@@ -1187,21 +1186,21 @@
"l10n",
"localization"
],
- "time": "2013-08-01 12:40:45"
+ "time": "2013-08-24 14:32:55"
},
{
"name": "symfony/locale",
- "version": "v2.3.3",
+ "version": "v2.3.4",
"target-dir": "Symfony/Component/Locale",
"source": {
"type": "git",
"url": "https://github.com/symfony/Locale.git",
- "reference": "v2.3.3"
+ "reference": "490825116712881a351b9a13ad6dddd4a39b8bb0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Locale/zipball/v2.3.3",
- "reference": "v2.3.3",
+ "url": "https://api.github.com/repos/symfony/Locale/zipball/490825116712881a351b9a13ad6dddd4a39b8bb0",
+ "reference": "490825116712881a351b9a13ad6dddd4a39b8bb0",
"shasum": ""
},
"require": {
@@ -1239,17 +1238,17 @@
},
{
"name": "symfony/options-resolver",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/OptionsResolver",
"source": {
"type": "git",
"url": "https://github.com/symfony/OptionsResolver.git",
- "reference": "v2.2.5"
+ "reference": "b36671093db40feacce2d489298f0782a0a61cfd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/b36671093db40feacce2d489298f0782a0a61cfd",
+ "reference": "b36671093db40feacce2d489298f0782a0a61cfd",
"shasum": ""
},
"require": {
@@ -1291,17 +1290,17 @@
},
{
"name": "symfony/process",
- "version": "v2.3.3",
+ "version": "v2.3.4",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "v2.3.3"
+ "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/v2.3.3",
- "reference": "v2.3.3",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
+ "reference": "1e91553e1cedd0b8fb1da6ea4f89b02e21713d5b",
"shasum": ""
},
"require": {
@@ -1334,21 +1333,21 @@
],
"description": "Symfony Process Component",
"homepage": "http://symfony.com",
- "time": "2013-08-02 21:51:01"
+ "time": "2013-08-22 06:42:25"
},
{
"name": "symfony/property-access",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/PropertyAccess",
"source": {
"type": "git",
"url": "https://github.com/symfony/PropertyAccess.git",
- "reference": "v2.2.5"
+ "reference": "2452dd5d49c1602876d9eeb4de15425d5f9a6342"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/2452dd5d49c1602876d9eeb4de15425d5f9a6342",
+ "reference": "2452dd5d49c1602876d9eeb4de15425d5f9a6342",
"shasum": ""
},
"require": {
@@ -1392,21 +1391,21 @@
"property path",
"reflection"
],
- "time": "2013-07-28 18:26:16"
+ "time": "2013-08-22 04:15:06"
},
{
"name": "symfony/routing",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Routing",
"source": {
"type": "git",
"url": "https://github.com/symfony/Routing.git",
- "reference": "v2.2.5"
+ "reference": "2704242137edc19cc61e71027a7a04eef28f42c6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Routing/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/Routing/zipball/2704242137edc19cc61e71027a7a04eef28f42c6",
+ "reference": "2704242137edc19cc61e71027a7a04eef28f42c6",
"shasum": ""
},
"require": {
@@ -1450,68 +1449,21 @@
],
"description": "Symfony Routing Component",
"homepage": "http://symfony.com",
- "time": "2013-07-30 11:22:46"
- },
- {
- "name": "symfony/serializer",
- "version": "v2.2.5",
- "target-dir": "Symfony/Component/Serializer",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Serializer.git",
- "reference": "v2.2.5"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Serializer/zipball/v2.2.5",
- "reference": "v2.2.5",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.2-dev"
- }
- },
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Serializer\\": ""
- }
- },
- "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 Serializer Component",
- "homepage": "http://symfony.com",
- "time": "2013-05-08 08:39:40"
+ "time": "2013-08-23 14:06:02"
},
{
"name": "symfony/translation",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Translation",
"source": {
"type": "git",
"url": "https://github.com/symfony/Translation.git",
- "reference": "32a1531e6298c037041ec82be95600e258938218"
+ "reference": "37a11fe823c28f9235548d253b215f07cec9a0de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Translation/zipball/32a1531e6298c037041ec82be95600e258938218",
- "reference": "32a1531e6298c037041ec82be95600e258938218",
+ "url": "https://api.github.com/repos/symfony/Translation/zipball/37a11fe823c28f9235548d253b215f07cec9a0de",
+ "reference": "37a11fe823c28f9235548d253b215f07cec9a0de",
"shasum": ""
},
"require": {
@@ -1552,7 +1504,7 @@
],
"description": "Symfony Translation Component",
"homepage": "http://symfony.com",
- "time": "2013-07-28 18:26:16"
+ "time": "2013-08-24 12:29:44"
},
{
"name": "symfony/validator",
@@ -1561,12 +1513,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/Validator.git",
- "reference": "55808a75bf373a8edb6400239268d315f0a326c7"
+ "reference": "8f6f6be47fb8e1179cd225b1f949630e26221e42"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Validator/zipball/55808a75bf373a8edb6400239268d315f0a326c7",
- "reference": "55808a75bf373a8edb6400239268d315f0a326c7",
+ "url": "https://api.github.com/repos/symfony/Validator/zipball/8f6f6be47fb8e1179cd225b1f949630e26221e42",
+ "reference": "8f6f6be47fb8e1179cd225b1f949630e26221e42",
"shasum": ""
},
"require": {
@@ -1613,21 +1565,21 @@
],
"description": "Symfony Validator Component",
"homepage": "http://symfony.com",
- "time": "2013-08-13 20:18:00"
+ "time": "2013-08-24 15:26:22"
},
{
"name": "symfony/yaml",
- "version": "v2.2.5",
+ "version": "v2.2.6",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "v2.2.5"
+ "reference": "d135717c1a42cb566cc09433658e7e8dbbe30b0a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/v2.2.5",
- "reference": "v2.2.5",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/d135717c1a42cb566cc09433658e7e8dbbe30b0a",
+ "reference": "d135717c1a42cb566cc09433658e7e8dbbe30b0a",
"shasum": ""
},
"require": {
@@ -1660,7 +1612,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "http://symfony.com",
- "time": "2013-07-11 09:28:01"
+ "time": "2013-08-24 06:36:00"
}
],
"packages-dev": [
diff --git a/core/lib/Thelia/Action/BaseAction.php b/core/lib/Thelia/Action/BaseAction.php
index bef57b30d..ab8f4abb8 100755
--- a/core/lib/Thelia/Action/BaseAction.php
+++ b/core/lib/Thelia/Action/BaseAction.php
@@ -40,52 +40,6 @@ class BaseAction
$this->container = $container;
}
- /**
- * Validate a BaseForm
- *
- * @param BaseForm $aBaseForm the form
- * @param string $expectedMethod the expected method, POST or GET, or null for any of them
- * @throws FormValidationException is the form contains error, or the method is not the right one
- * @return \Symfony\Component\Form\Form Form the symfony form object
- */
- protected function validateForm(BaseForm $aBaseForm, $expectedMethod = null)
- {
- $form = $aBaseForm->getForm();
-
- if ($expectedMethod == null || $aBaseForm->getRequest()->isMethod($expectedMethod)) {
-
- $form->bind($aBaseForm->getRequest());
-
- if ($form->isValid()) {
- return $form;
- } else {
- throw new FormValidationException("Missing or invalid data");
- }
- } else {
- throw new FormValidationException(sprintf("Wrong form method, %s expected.", $expectedMethod));
- }
- }
-
- /**
- * Propagate a form error in the action event
- *
- * @param BaseForm $aBaseForm the form
- * @param string $error_message an error message that may be displayed to the customer
- * @param ActionEvent $event the action event
- */
- protected function propagateFormError(BaseForm $aBaseForm, $error_message, ActionEvent $event)
- {
- // The form has an error
- $aBaseForm->setError(true);
- $aBaseForm->setErrorMessage($error_message);
-
- // Store the form in the parser context
- $event->setErrorForm($aBaseForm);
-
- // Stop event propagation
- $event->stopPropagation();
- }
-
/**
* Return the event dispatcher,
*
@@ -96,4 +50,33 @@ class BaseAction
return $this->container->get('event_dispatcher');
}
-}
+ /**
+ * Check current user authorisations.
+ *
+ * @param mixed $roles a single role or an array of roles.
+ * @param mixed $permissions a single permission or an array of permissions.
+ *
+ * @throws AuthenticationException if permissions are not granted to the current user.
+ */
+ protected function checkAuth($roles, $permissions) {
+
+ if (! $this->getSecurityContext()->isGranted(
+ is_array($roles) ? $roles : array($roles),
+ is_array($permissions) ? $permissions : array($permissions)) ) {
+
+ Tlog::getInstance()->addAlert("Authorization roles:", $roles, " permissions:", $permissions, " refused.");
+
+ throw new AuthorizationException("Sorry, you're not allowed to perform this action");
+ }
+ }
+
+ /**
+ * Return the security context
+ *
+ * @return Thelia\Core\Security\SecurityContext
+ */
+ protected function getSecurityContext()
+ {
+ return $this->container->get('thelia.securityContext');
+ }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Action/Category.php b/core/lib/Thelia/Action/Category.php
index 6e5b7ba00..d411d2a51 100755
--- a/core/lib/Thelia/Action/Category.php
+++ b/core/lib/Thelia/Action/Category.php
@@ -24,134 +24,46 @@
namespace Thelia\Action;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Thelia\Core\Event\ActionEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Category as CategoryModel;
-use Thelia\Form\CategoryCreationForm;
-use Thelia\Core\Event\CategoryEvent;
-use Thelia\Tools\Redirect;
use Thelia\Model\CategoryQuery;
-use Thelia\Model\AdminLog;
-use Thelia\Form\CategoryDeletionForm;
-use Thelia\Action\Exception\FormValidationException;
use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\Propel;
use Thelia\Model\Map\CategoryTableMap;
use Propel\Runtime\Exception\PropelException;
+use Thelia\Core\Event\CategoryCreateEvent;
+use Thelia\Core\Event\CategoryDeleteEvent;
+use Thelia\Core\Event\CategoryToggleVisibilityEvent;
+use Thelia\Core\Event\CategoryChangePositionEvent;
+
class Category extends BaseAction implements EventSubscriberInterface
{
- public function create(ActionEvent $event)
+ public function create(CategoryCreateEvent $event)
{
-
$this->checkAuth("ADMIN", "admin.category.create");
- $request = $event->getRequest();
+ $category = new CategoryModel();
- try {
- $categoryCreationForm = new CategoryCreationForm($request);
+ $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CREATECATEGORY, $event);
- $form = $this->validateForm($categoryCreationForm, "POST");
+ $category->create(
+ $event->getTitle(),
+ $event->getParent(),
+ $event->getLocale()
+ );
- $data = $form->getData();
+ $event->setCreatedCategory($category);
- $category = new CategoryModel();
-
- $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CREATECATEGORY, $event);
-
- $category->create(
- $data["title"],
- $data["parent"],
- $data["locale"]
- );
-
- AdminLog::append(sprintf("Category %s (ID %s) created", $category->getTitle(), $category->getId()), $request, $request->getSession()->getAdminUser());
-
- $categoryEvent = new CategoryEvent($category);
-
- $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CREATECATEGORY, $categoryEvent);
-
- // Substitute _ID_ in the URL with the ID of the created category
- $successUrl = str_replace('_ID_', $category->getId(), $categoryCreationForm->getSuccessUrl());
-
- // Redirect to the success URL
- $this->redirect($successUrl);
-
- } catch (PropelException $e) {
- Tlog::getInstance()->error(sprintf('error during creating category with message "%s"', $e->getMessage()));
-
- $message = "Failed to create this category, please try again.";
- }
-
- // The form has errors, propagate it.
- $this->propagateFormError($categoryCreationForm, $message, $event);
+ $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CREATECATEGORY, $event);
}
- public function modify(ActionEvent $event)
+ public function modify(CategoryChangeEvent $event)
{
+ $this->checkAuth("ADMIN", "admin.category.change");
- $this->checkAuth("ADMIN", "admin.category.delete");
-
- $request = $event->getRequest();
-
- $customerModification = new CustomerModification($request);
-
- $form = $customerModification->getForm();
-
- if ($request->isMethod("post")) {
-
- $form->bind($request);
-
- if ($form->isValid()) {
- $data = $form->getData();
-
- $customer = CustomerQuery::create()->findPk(1);
- try {
- $customerEvent = new CustomerEvent($customer);
- $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CHANGECUSTOMER, $customerEvent);
-
- $data = $form->getData();
-
- $customer->createOrUpdate(
- $data["title"],
- $data["firstname"],
- $data["lastname"],
- $data["address1"],
- $data["address2"],
- $data["address3"],
- $data["phone"],
- $data["cellphone"],
- $data["zipcode"],
- $data["country"]
- );
-
- $customerEvent->customer = $customer;
- $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CHANGECUSTOMER, $customerEvent);
-
- // Update the logged-in user, and redirect to the success URL (exits)
- // We don-t send the login event, as the customer si already logged.
- $this->processSuccessfullLogin($event, $customer, $customerModification);
- } catch (PropelException $e) {
-
- Tlog::getInstance()->error(sprintf('error during modifying customer on action/modifyCustomer with message "%s"', $e->getMessage()));
-
- $message = "Failed to change your account, please try again.";
- }
- } else {
- $message = "Missing or invalid data";
- }
- } else {
- $message = "Wrong form method !";
- }
-
- // The form has an error
- $customerModification->setError(true);
- $customerModification->setErrorMessage($message);
-
- // Dispatch the errored form
- $event->setErrorForm($customerModification);
-
+ // TODO !!
}
/**
@@ -159,50 +71,22 @@ class Category extends BaseAction implements EventSubscriberInterface
*
* @param ActionEvent $event
*/
- public function delete(ActionEvent $event)
+ public function delete(CategoryDeleteEvent $event)
{
-
$this->checkAuth("ADMIN", "admin.category.delete");
- $request = $event->getRequest();
+ $category = CategoryQuery::create()->findPk($event->getId());
- try {
- $categoryDeletionForm = new CategoryDeletionForm($request);
+ if ($category !== null) {
- $form = $this->validateForm($categoryDeletionForm, "POST");
+ $event->setDeletedCategory($category);
- $data = $form->getData();
-
- $category = CategoryQuery::create()->findPk($data['id']);
-
- $categoryEvent = new CategoryEvent($category);
-
- $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_DELETECATEGORY, $categoryEvent);
+ $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_DELETECATEGORY, $event);
$category->delete();
- AdminLog::append(sprintf("Category %s (ID %s) deleted", $category->getTitle(), $category->getId()), $request, $request->getSession()->getAdminUser());
-
- $categoryEvent->category = $category;
-
- $event->getDispatcher()->dispatch(TheliaEvents::AFTER_DELETECATEGORY, $categoryEvent);
-
- // Substitute _ID_ in the URL with the ID of the created category
- $successUrl = str_replace('_ID_', $category->getParent(), $categoryDeletionForm->getSuccessUrl());
-
- // Redirect to the success URL
- Redirect::exec($successUrl);
- } catch (PropelException $e) {
-
- \Thelia\Log\Tlog::getInstance()->error(sprintf('error during deleting category ID=%s on action/modifyCustomer with message "%s"', $data['id'], $e->getMessage()));
-
- $message = "Failed to change your account, please try again.";
- } catch (FormValidationException $e) {
-
- $message = $e->getMessage();
+ $event->getDispatcher()->dispatch(TheliaEvents::AFTER_DELETECATEGORY, $event);
}
-
- $this->propagateFormError($categoryDeletionForm, $message, $event);
}
/**
@@ -210,63 +94,55 @@ class Category extends BaseAction implements EventSubscriberInterface
*
* @param ActionEvent $event
*/
- public function toggleVisibility(ActionEvent $event)
+ public function toggleVisibility(CategoryToggleVisibilityEvent $event)
{
-
$this->checkAuth("ADMIN", "admin.category.edit");
- $request = $event->getRequest();
-
- $category = CategoryQuery::create()->findPk($request->get('category_id', 0));
+ $category = CategoryQuery::create()->findPk($event->getId());
if ($category !== null) {
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CHANGECATEGORY, $event);
+
$category->setVisible($category->getVisible() ? false : true);
$category->save();
- $categoryEvent = new CategoryEvent($category);
-
- $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CHANGECATEGORY, $categoryEvent);
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CHANGECATEGORY, $event);
}
}
/**
- * Move category up
+ * Changes category position, selecting absolute ou relative change.
*
- * @param ActionEvent $event
+ * @param CategoryChangePositionEvent $event
*/
- public function changePositionUp(ActionEvent $event)
+ public function changePosition(CategoryChangePositionEvent $event)
{
- return $this->exchangePosition($event, 'up');
- }
+ $this->checkAuth("ADMIN", "admin.category.edit");
- /**
- * Move category down
- *
- * @param ActionEvent $event
- */
- public function changePositionDown(ActionEvent $event)
- {
- return $this->exchangePosition($event, 'down');
+ if ($event->getMode() == CategoryChangePositionEvent::POSITION_ABSOLUTE)
+ return $this->changeAbsolutePosition($event);
+ else
+ return $this->exchangePosition($event);
}
/**
* Move up or down a category
*
- * @param ActionEvent $event
- * @param string $direction up to move up, down to move down
+ * @param CategoryChangePositionEvent $event
*/
- protected function exchangePosition(ActionEvent $event, $direction)
+ protected function exchangePosition(CategoryChangePositionEvent $event)
{
- $this->checkAuth("ADMIN", "admin.category.edit");
-
- $request = $event->getRequest();
-
- $category = CategoryQuery::create()->findPk($request->get('category_id', 0));
+ $category = CategoryQuery::create()->findPk($event->getId());
if ($category !== null) {
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CHANGECATEGORY, $event);
+
// The current position of the category
$my_position = $category->getPosition();
@@ -275,10 +151,10 @@ class Category extends BaseAction implements EventSubscriberInterface
->filterByParent($category->getParent());
// Up or down ?
- if ($direction == 'up') {
+ if ($event->getMode() == CategoryChangePositionEvent::POSITION_UP) {
// Find the category immediately before me
$search->filterByPosition(array('max' => $my_position-1))->orderByPosition(Criteria::DESC);
- } elseif ($direction == 'down') {
+ } elseif ($event->getMode() == CategoryChangePositionEvent::POSITION_DOWN) {
// Find the category immediately after me
$search->filterByPosition(array('min' => $my_position+1))->orderByPosition(Criteria::ASC);
} else
@@ -304,26 +180,30 @@ class Category extends BaseAction implements EventSubscriberInterface
$cnx->rollback();
}
}
+
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CHANGECATEGORY, $event);
}
}
/**
* Changes category position
*
- * @param ActionEvent $event
+ * @param CategoryChangePositionEvent $event
*/
- public function changePosition(ActionEvent $event)
+ protected function changeAbsolutePosition(CategoryChangePositionEvent $event)
{
$this->checkAuth("ADMIN", "admin.category.edit");
- $request = $event->getRequest();
-
- $category = CategoryQuery::create()->findPk($request->get('category_id', 0));
+ $category = CategoryQuery::create()->findPk($event->getId());
if ($category !== null) {
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::BEFORE_CHANGECATEGORY, $event);
+
// The required position
- $new_position = $request->get('position', null);
+ $new_position = $event->getPosition();
// The current position
$current_position = $category->getPosition();
@@ -363,6 +243,9 @@ class Category extends BaseAction implements EventSubscriberInterface
$cnx->rollback();
}
}
+
+ $event->setCategory($category);
+ $event->getDispatcher()->dispatch(TheliaEvents::AFTER_CHANGECATEGORY, $event);
}
}
@@ -389,12 +272,14 @@ class Category extends BaseAction implements EventSubscriberInterface
public static function getSubscribedEvents()
{
return array(
- "action.createCategory" => array("create", 128),
- "action.modifyCategory" => array("modify", 128),
- "action.deleteCategory" => array("delete", 128),
+ TheliaEvents::CATEGORY_CREATE => array("create", 128),
+ TheliaEvents::CATEGORY_MODIFY => array("modify", 128),
+ TheliaEvents::CATEGORY_DELETE => array("delete", 128),
- "action.toggleCategoryVisibility" => array("toggleVisibility", 128),
- "action.changeCategoryPositionUp" => array("changePositionUp", 128),
+ TheliaEvents::CATEGORY_TOGGLE_VISIBILITY => array("toggleVisibility", 128),
+ TheliaEvents::CATEGORY_CHANGE_POSITION => array("changePosition", 128),
+
+ "action.changeCategoryPositionU" => array("changePositionUp", 128),
"action.changeCategoryPositionDown" => array("changePositionDown", 128),
"action.changeCategoryPosition" => array("changePosition", 128),
);
diff --git a/core/lib/Thelia/Action/Customer.php b/core/lib/Thelia/Action/Customer.php
index 785ee8f48..4c7a71d5e 100755
--- a/core/lib/Thelia/Action/Customer.php
+++ b/core/lib/Thelia/Action/Customer.php
@@ -96,7 +96,7 @@ class Customer extends BaseAction implements EventSubscriberInterface
{
$event->getDispatcher()->dispatch(TheliaEvents::CUSTOMER_LOGOUT, $event);
- $this->getFrontSecurityContext()->clear();
+ $this->getSecurityContext()->clearCustomerUser();
}
public function changePassword(ActionEvent $event)
@@ -127,8 +127,8 @@ class Customer extends BaseAction implements EventSubscriberInterface
public static function getSubscribedEvents()
{
return array(
- "action.createCustomer" => array("create", 128),
- "action.modifyCustomer" => array("modify", 128),
+ TheliaEvents::CUSTOMER_CREATEACCOUNT => array("create", 128),
+ TheliaEvents::CUSTOMER_UPDATEACCOUNT => array("modify", 128),
);
}
}
diff --git a/core/lib/Thelia/Cart/CartTrait.php b/core/lib/Thelia/Cart/CartTrait.php
index ed4f70374..901263a32 100755
--- a/core/lib/Thelia/Cart/CartTrait.php
+++ b/core/lib/Thelia/Cart/CartTrait.php
@@ -28,8 +28,8 @@ use Thelia\Model\ConfigQuery;
use Thelia\Model\Customer;
use Symfony\Component\HttpFoundation\Request;
use Thelia\Core\HttpFoundation\Session\Session;
-use Thelia\Core\Event\Internal\CartEvent;
use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Event\CartEvent;
trait CartTrait
{
@@ -42,8 +42,9 @@ trait CartTrait
*/
public function getCart(Request $request)
{
+ $session = $request->getSession();
- if (null !== $cart = $request->getSession()->getCart()) {
+ if (null !== $cart = $session->getCart()) {
return $cart;
}
@@ -55,26 +56,26 @@ trait CartTrait
if ($cart) {
//le panier existe en base
- $customer = $request->getSession()->getCustomerUser();
+ $customer = $session->getCustomerUser();
if ($customer) {
if ($cart->getCustomerId() != $customer->getId()) {
//le customer du panier n'est pas le mm que celui connecté, il faut cloner le panier sans le customer_id
- $cart = $this->duplicateCart($cart, $request->getSession(), $customer);
+ $cart = $this->duplicateCart($cart, $session, $customer);
}
} else {
if ($cart->getCustomerId() != null) {
//il faut dupliquer le panier sans le customer_id
- $cart = $this->duplicateCart($cart, $request->getSession());
+ $cart = $this->duplicateCart($cart, $session);
}
}
} else {
- $cart = $this->createCart($request->getSession());
+ $cart = $this->createCart($session);
}
} else {
//le cookie de panier n'existe pas, il va falloir le créer et faire un enregistrement en base.
- $cart = $this->createCart($request->getSession());
+ $cart = $this->createCart($session);
}
return $cart;
@@ -116,7 +117,7 @@ trait CartTrait
$cartEvent = new CartEvent($newCart);
$this->getDispatcher()->dispatch(TheliaEvents::CART_DUPLICATE, $cartEvent);
- return $cartEvent->cart;
+ return $cartEvent->getCart();
}
protected function generateCookie()
@@ -131,4 +132,4 @@ trait CartTrait
return $id;
}
-}
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Config/Resources/action.xml b/core/lib/Thelia/Config/Resources/action.xml
index f773b4cd7..2bd31ce3e 100755
--- a/core/lib/Thelia/Config/Resources/action.xml
+++ b/core/lib/Thelia/Config/Resources/action.xml
@@ -22,16 +22,16 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 60105ad32..45c763830 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -85,8 +85,6 @@
-
-
diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 67cecd302..271ce3c05 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -30,11 +30,22 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Tools\URL;
use Thelia\Tools\Redirect;
+use Thelia\Core\Security\SecurityContext;
+use Thelia\Model\AdminLog;
class BaseAdminController extends BaseController
{
const TEMPLATE_404 = "404";
+ /**
+ * Helper to append a message to the admin log.
+ *
+ * @param unknown $message
+ */
+ public function adminLogAppend($message) {
+ AdminLog::append($message, $this->getRequest(), $this->getSecurityContext()->getAdminUser());
+ }
+
public function processTemplateAction($template)
{
try {
diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index 0c92d24dc..fda94191c 100755
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -25,12 +25,52 @@ namespace Thelia\Controller\Admin;
use Thelia\Core\Security\Exception\AuthenticationException;
use Thelia\Core\Security\Exception\AuthorizationException;
+use Thelia\Log\Tlog;
+use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Event\CategoryCreateEvent;
+use Thelia\Form\CategoryCreationForm;
+use Thelia\Core\Event\CategoryDeleteEvent;
+use Thelia\Core\Event\CategoryToggleVisibilityEvent;
+use Thelia\Core\Event\CategoryChangePositionEvent;
+use Thelia\Form\CategoryDeletionForm;
class CategoryController extends BaseAdminController
{
protected function createNewCategory($args)
{
- $this->dispatchEvent("createCategory");
+ try {
+ $categoryCreationForm = new CategoryCreationForm($this->getRequest());
+
+ $form = $this->validateForm($categoryCreationForm, "POST");
+
+ $data = $form->getData();
+
+ $categoryCreateEvent = new CategoryCreateEvent(
+ $data["title"],
+ $data["parent"],
+ $data["locale"]
+ );
+
+ $this->dispatch(TheliaEvents::CATEGORY_CREATE, $categoryCreateEvent);
+
+ $category = $categoryCreateEvent->getCreatedCategory();
+
+ $this->adminLogAppend(sprintf("Category %s (ID %s) created", $category->getTitle(), $category->getId()));
+
+ // Substitute _ID_ in the URL with the ID of the created category
+ $successUrl = str_replace('_ID_', $category->getId(), $categoryCreationForm->getSuccessUrl());
+
+ // Redirect to the success URL
+ $this->redirect($successUrl);
+ }
+ catch (FormValidationException $e) {
+ $categoryCreationForm->setErrorMessage($e->getMessage());
+ $this->getParserContext()->setErrorForm($categoryCreationForm);
+ }
+ catch (Exception $e) {
+ Tlog::getInstance()->error(sprintf("Failed to create category: %s", $e->getMessage()));
+ $this->getParserContext()->setGeneralError($e->getMessage());
+ }
// At this point, the form has error, and should be redisplayed.
return $this->render('categories', $args);
@@ -45,9 +85,35 @@ class CategoryController extends BaseAdminController
protected function deleteCategory($args)
{
- $this->dispatchEvent("deleteCategory");
+ try {
+ $categoryDeletionForm = new CategoryDeletionForm($this->getRequest());
- // Something was wrong, category was not deleted. Display parent category list
+ $data = $this->validateForm($categoryDeletionForm, "POST")->getData();
+var_dump($data);
+ $categoryDeleteEvent = new CategoryDeleteEvent($data['category_id']);
+
+ $this->dispatch(TheliaEvents::CATEGORY_DELETE, $categoryDeleteEvent);
+
+ $category = $categoryDeleteEvent->getDeletedCategory();
+
+ $this->adminLogAppend(sprintf("Category %s (ID %s) deleted", $category->getTitle(), $category->getId()));
+
+ // Substitute _ID_ in the URL with the ID of the created category
+ $successUrl = str_replace('_ID_', $categoryDeleteEvent->getDeletedCategory()->getId(), $categoryDeletionForm->getSuccessUrl());
+
+ // Redirect to the success URL
+ $this->redirect($successUrl);
+ }
+ catch (FormValidationException $e) {
+ $categoryDeletionForm->setErrorMessage($e->getMessage());
+ $this->getParserContext()->setErrorForm($categoryDeletionForm);
+ }
+ catch (Exception $e) {
+ Tlog::getInstance()->error(sprintf("Failed to delete category: %s", $e->getMessage()));
+ $this->getParserContext()->setGeneralError($e->getMessage());
+ }
+
+ // At this point, something was wrong, category was not deleted. Display parent category list
return $this->render('categories', $args);
}
@@ -60,28 +126,48 @@ class CategoryController extends BaseAdminController
protected function visibilityToggle($args)
{
- $this->dispatchEvent("toggleCategoryVisibility");
+ $event = new CategoryToggleVisibilityEvent($this->getRequest()->get('category_id', 0));
+
+ $this->dispatch(TheliaEvents::CATEGORY_TOGGLE_VISIBILITY, $event);
return $this->nullResponse();
}
protected function changePosition($args)
{
- $this->dispatchEvent("changeCategoryPosition");
+ $request = $this->getRequest();
+
+ $event = new CategoryChangePositionEvent(
+ $request->get('category_id', 0),
+ CategoryChangePositionEvent::POSITION_ABSOLUTE,
+ $request->get('position', null)
+ );
+
+ $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event);
return $this->render('categories', $args);
}
protected function positionDown($args)
{
- $this->dispatchEvent("changeCategoryPositionDown");
+ $event = new CategoryChangePositionEvent(
+ $this->getRequest()->get('category_id', 0),
+ CategoryChangePositionEvent::POSITION_DOWN
+ );
+
+ $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event);
return $this->render('categories', $args);
}
protected function positionUp($args)
{
- $this->dispatchEvent("changeCategoryPositionUp");
+ $event = new CategoryChangePositionEvent(
+ $this->getRequest()->get('category_id', 0),
+ CategoryChangePositionEvent::POSITION_UP
+ );
+
+ $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event);
return $this->render('categories', $args);
}
@@ -138,9 +224,11 @@ class CategoryController extends BaseAdminController
return $this->positionDown($args);
}
- } catch (AuthorizationException $ex) {
+ }
+ catch (AuthorizationException $ex) {
return $this->errorPage($ex->getMessage());
- } catch (AuthenticationException $ex) {
+ }
+ catch (AuthenticationException $ex) {
return $this->errorPage($ex->getMessage());
}
diff --git a/core/lib/Thelia/Controller/Admin/SessionController.php b/core/lib/Thelia/Controller/Admin/SessionController.php
index 5299253e0..39dbc1205 100755
--- a/core/lib/Thelia/Controller/Admin/SessionController.php
+++ b/core/lib/Thelia/Controller/Admin/SessionController.php
@@ -43,7 +43,7 @@ class SessionController extends BaseAdminController
{
$this->dispatch(TheliaEvents::ADMIN_LOGOUT);
- $this->getSecurityContext()->clear();
+ $this->getSecurityContext()->clearAdminUser();
// Go back to login page.
return Redirect::exec(URL::absoluteUrl('/admin/login')); // FIXME - should be a parameter
@@ -61,7 +61,7 @@ class SessionController extends BaseAdminController
$user = $authenticator->getAuthentifiedUser();
// Success -> store user in security context
- $this->getSecurityContext()->setUser($user);
+ $this->getSecurityContext()->setAdminUser($user);
// Log authentication success
AdminLog::append("Authentication successful", $request, $user);
diff --git a/core/lib/Thelia/Controller/BaseController.php b/core/lib/Thelia/Controller/BaseController.php
index 5c6e3eb5e..1a610768d 100755
--- a/core/lib/Thelia/Controller/BaseController.php
+++ b/core/lib/Thelia/Controller/BaseController.php
@@ -34,6 +34,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
use Thelia\Core\Factory\ActionEventFactory;
use Thelia\Form\BaseForm;
use Thelia\Form\Exception\FormValidationException;
+use Symfony\Component\EventDispatcher\Event;
/**
*
@@ -56,34 +57,12 @@ class BaseController extends ContainerAware
}
/**
- * Create an action event
+ * Dispatch a Thelia event
*
- * @param string $action
- * @return EventDispatcher
+ * @param string $eventName a TheliaEvent name, as defined in TheliaEvents class
+ * @param Event $event the event
*/
- protected function dispatchEvent($action)
- {
- // Create the
- $eventFactory = new ActionEventFactory($this->getRequest(), $action, $this->container->getParameter("thelia.actionEvent"));
-
- $actionEvent = $eventFactory->createActionEvent();
-
- $this->dispatch("action.$action", $actionEvent);
-
- if ($actionEvent->hasErrorForm()) {
- $this->getParserContext()->setErrorForm($actionEvent->getErrorForm());
- }
-
- return $actionEvent;
- }
-
- /**
- * Dispatch a Thelia event to modules
- *
- * @param string $eventName a TheliaEvent name, as defined in TheliaEvents class
- * @param ActionEvent $event the event
- */
- protected function dispatch($eventName, ActionEvent $event = null)
+ protected function dispatch($eventName, Event $event = null)
{
$this->getDispatcher()->dispatch($eventName, $event);
}
@@ -113,13 +92,9 @@ class BaseController extends ContainerAware
*
* @return \Thelia\Core\Security\SecurityContext
*/
- protected function getSecurityContext($context = false)
+ protected function getSecurityContext()
{
- $securityContext = $this->container->get('thelia.securityContext');
-
- $securityContext->setContext($context === false ? SecurityContext::CONTEXT_BACK_OFFICE : $context);
-
- return $securityContext;
+ return $this->container->get('thelia.securityContext');
}
/**
diff --git a/core/lib/Thelia/Controller/Front/CustomerController.php b/core/lib/Thelia/Controller/Front/CustomerController.php
index 07f9eb4c8..698c69d70 100755
--- a/core/lib/Thelia/Controller/Front/CustomerController.php
+++ b/core/lib/Thelia/Controller/Front/CustomerController.php
@@ -36,6 +36,7 @@ use Thelia\Form\CustomerModification;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Model\Customer;
use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Event\CustomerEvent;
class CustomerController extends BaseFrontController
{
@@ -76,7 +77,7 @@ class CustomerController extends BaseFrontController
try {
- $customer = $this->getSecurityContext(SecurityContext::CONTEXT_FRONT_OFFICE)->getUser();
+ $customer = $this->getSecurityContext()->getCustomerUser();
$form = $this->validateForm($customerModification, "post");
@@ -116,9 +117,7 @@ class CustomerController extends BaseFrontController
try {
$customer = $authenticator->getAuthentifiedUser();
- $customerLoginEvent = new CustomerLoginEvent($customer);
-
- $this->processLogin($customer, $customerLoginEvent);
+ $this->processLogin($customer);
$this->redirectSuccess();
} catch (ValidatorException $e) {
@@ -132,11 +131,11 @@ class CustomerController extends BaseFrontController
}
}
- public function processLogin(Customer $customer,$event = null)
+ public function processLogin(Customer $customer)
{
- $this->getSecurityContext(SecurityContext::CONTEXT_FRONT_OFFICE)->setUser($customer);
+ $this->getSecurityContext()->setCustomerUser($customer);
- if($event) $this->dispatch(TheliaEvents::CUSTOMER_LOGIN, $event);
+ if($event) $this->dispatch(TheliaEvents::CUSTOMER_LOGIN, new CustomerLoginEvent($customer));
}
/**
diff --git a/core/lib/Thelia/Core/Event/ActionEvent.php b/core/lib/Thelia/Core/Event/ActionEvent.php
index c5c188235..5040be7f5 100755
--- a/core/lib/Thelia/Core/Event/ActionEvent.php
+++ b/core/lib/Thelia/Core/Event/ActionEvent.php
@@ -35,27 +35,8 @@ use Thelia\Form\BaseForm;
*/
abstract class ActionEvent extends Event
{
-
- /**
- *
- * @var Symfony\Component\HttpFoundation\Request
- */
- protected $request;
-
- protected $errorForm = null;
-
protected $parameters = array();
- /**
- *
- * @param \Symfony\Component\HttpFoundation\Request $request
- * @param string $action
- */
- public function __construct(Request $request)
- {
- $this->request = $request;
- }
-
public function __set($name, $value)
{
$this->parameters[$name] = $value;
@@ -69,30 +50,4 @@ abstract class ActionEvent extends Event
return null;
}
-
- /**
- *
- * @return \Symfony\Component\HttpFoundation\Request
- */
- public function getRequest()
- {
- return $this->request;
- }
-
- public function setErrorForm(BaseForm $form)
- {
- $this->errorForm = $form;
-
- if ($form != null) $this->stopPropagation();
- }
-
- public function getErrorForm()
- {
- return $this->errorForm;
- }
-
- public function hasErrorForm()
- {
- return $this->errorForm != null ? true : false;
- }
-}
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/CartItemEvent.php b/core/lib/Thelia/Core/Event/CartItemEvent.php
index 59deffb37..6718b63ff 100755
--- a/core/lib/Thelia/Core/Event/CartItemEvent.php
+++ b/core/lib/Thelia/Core/Event/CartItemEvent.php
@@ -25,7 +25,7 @@ namespace Thelia\Core\Event;
use Thelia\Model\CartItem;
-class CartItemEvent extends InternalEvent
+class CartItemEvent extends ActionEvent
{
protected $cartItem;
diff --git a/core/lib/Thelia/Core/Context.php b/core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php
old mode 100755
new mode 100644
similarity index 64%
rename from core/lib/Thelia/Core/Context.php
rename to core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php
index 6fa5a638b..141fc8182
--- a/core/lib/Thelia/Core/Context.php
+++ b/core/lib/Thelia/Core/Event/CategoryChangePositionEvent.php
@@ -21,34 +21,64 @@
/* */
/*************************************************************************************/
-namespace Thelia\Core;
+namespace Thelia\Core\Event;
+use Thelia\Model\Category;
-class Context
+class CategoryChangePositionEvent extends ActionEvent
{
- const CONTEXT_FRONT_OFFICE = 'front';
- const CONTEXT_BACK_OFFICE = 'admin';
+ const POSITION_UP = 1;
+ const POSITION_DOWN = 2;
+ const POSITION_ABSOLUTE = 3;
- protected $defineContext = array(
- self::CONTEXT_BACK_OFFICE,
- self::CONTEXT_FRONT_OFFICE
- );
+ protected $id;
+ protected $mode;
+ protected $position;
+ protected $category;
- protected $currentContext = self::CONTEXT_FRONT_OFFICE;
-
- public function isValidContext($context)
+ public function __construct($id, $mode, $position = null)
{
- return in_array($context, $this->defineContext);
+ $this->id = $id;
+ $this->mode = $mode;
+ $this->position = $position;
}
- public function setContext($context)
+ public function getId()
{
- if ($this->isValidContext($context)) {
- $this->currentContext = $context;
- }
+ return $this->id;
}
- public function getContext()
+ public function setId($id)
{
- return $this->currentContext;
+ $this->id = $id;
}
-}
+
+ public function getMode()
+ {
+ return $this->mode;
+ }
+
+ public function setMode($mode)
+ {
+ $this->mode = $mode;
+ }
+
+ public function getPosition()
+ {
+ return $this->position;
+ }
+
+ public function setPosition($position)
+ {
+ $this->position = $position;
+ }
+
+ public function getCategory()
+ {
+ return $this->category;
+ }
+
+ public function setCategory($category)
+ {
+ $this->category = $category;
+ }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/Internal/InternalEvent.php b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
old mode 100755
new mode 100644
similarity index 62%
rename from core/lib/Thelia/Core/Event/Internal/InternalEvent.php
rename to core/lib/Thelia/Core/Event/CategoryCreateEvent.php
index 49273769f..558b04277
--- a/core/lib/Thelia/Core/Event/Internal/InternalEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryCreateEvent.php
@@ -21,16 +21,62 @@
/* */
/*************************************************************************************/
-namespace Thelia\Core\Event\Internal;
+namespace Thelia\Core\Event;
-use Symfony\Component\EventDispatcher\Event;
+use Thelia\Model\Category;
-/**
- * Base class used for internal event like creating new Customer, adding item to cart, etc
- *
- * Class InternalEvent
- * @package Thelia\Core\Event
- */
-abstract class InternalEvent extends Event
+class CategoryCreateEvent extends ActionEvent
{
+ protected $title;
+ protected $parent;
+ protected $locale;
+ protected $created_category;
+
+ public function __construct($title, $parent, $locale)
+ {
+ $this->title = $title;
+ $this->parent = $parent;
+ $this->locale = $locale;
+ }
+
+ public function getTitle()
+ {
+ return $this->title;
+ }
+
+ public function setTitle($title)
+ {
+ $this->title = $title;
+ }
+
+ public function getParent()
+ {
+ return $this->parent;
+ }
+
+ public function setParent($parent)
+ {
+ $this->parent = $parent;
+ }
+
+ public function getLocale()
+ {
+ return $this->locale;
+ }
+
+ public function setLocale($locale)
+ {
+ $this->locale = $locale;
+ }
+
+ public function getCreatedCategory()
+ {
+ return $this->created_category;
+ }
+
+ public function setCreatedCategory(Category $created_category)
+ {
+ $this->created_category = $created_category;
+var_dump($this->created_category);
+ }
}
diff --git a/core/lib/Thelia/Core/Event/Internal/CartEvent.php b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
old mode 100755
new mode 100644
similarity index 76%
rename from core/lib/Thelia/Core/Event/Internal/CartEvent.php
rename to core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
index 7d35bea55..c53cb7e10
--- a/core/lib/Thelia/Core/Event/Internal/CartEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryDeleteEvent.php
@@ -21,17 +21,36 @@
/* */
/*************************************************************************************/
-namespace Thelia\Core\Event\Internal;
+namespace Thelia\Core\Event;
+use Thelia\Model\Category;
-use Thelia\Model\Cart;
-
-class CartEvent extends InternalEvent
+class CategoryDeleteEvent extends ActionEvent
{
- public $cart;
+ protected $id;
+ protected $deleted_category;
- public function __construct(Cart $cart)
+ public function __construct($id)
{
- $this->cart = $cart;
+ $this->id = $id;
}
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ public function setId($id)
+ {
+ $this->id = $id;
+ }
+
+ public function getDeletedCategory()
+ {
+ return $this->deleted_category;
+ }
+
+ public function setDeletedCategory(Category $deleted_category)
+ {
+ $this->deleted_category = $deleted_category;
+ }
}
diff --git a/core/lib/Thelia/Core/Event/CategoryEvent.php b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
old mode 100755
new mode 100644
similarity index 81%
rename from core/lib/Thelia/Core/Event/CategoryEvent.php
rename to core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
index 44986e8b9..b7237924e
--- a/core/lib/Thelia/Core/Event/CategoryEvent.php
+++ b/core/lib/Thelia/Core/Event/CategoryToggleVisibilityEvent.php
@@ -22,15 +22,35 @@
/*************************************************************************************/
namespace Thelia\Core\Event;
-
use Thelia\Model\Category;
-class CategoryEvent extends InternalEvent
+class CategoryToggleVisibilityEvent extends ActionEvent
{
- public $category;
+ protected $id;
+ protected $category;
- public function __construct(Category $category)
+ public function __construct($id)
+ {
+ $this->id = $id;
+ }
+
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ public function setId($id)
+ {
+ $this->id = $id;
+ }
+
+ public function getCategory()
+ {
+ return $this->category;
+ }
+
+ public function setCategory(Category $category)
{
$this->category = $category;
}
-}
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Event/Internal/CustomerEvent.php b/core/lib/Thelia/Core/Event/CustomerEvent.php
similarity index 95%
rename from core/lib/Thelia/Core/Event/Internal/CustomerEvent.php
rename to core/lib/Thelia/Core/Event/CustomerEvent.php
index 46c9278cb..656f023c9 100755
--- a/core/lib/Thelia/Core/Event/Internal/CustomerEvent.php
+++ b/core/lib/Thelia/Core/Event/CustomerEvent.php
@@ -21,11 +21,12 @@
/* */
/*************************************************************************************/
-namespace Thelia\Core\Event\Internal;
+namespace Thelia\Core\Event;
use Thelia\Model\Customer;
+use Thelia\Core\Event\ActionEvent;
-class CustomerEvent extends InternalEvent
+class CustomerEvent extends ActionEvent
{
public $customer;
diff --git a/core/lib/Thelia/Core/Event/TheliaEvents.php b/core/lib/Thelia/Core/Event/TheliaEvents.php
index 81fc34097..2dd85905d 100755
--- a/core/lib/Thelia/Core/Event/TheliaEvents.php
+++ b/core/lib/Thelia/Core/Event/TheliaEvents.php
@@ -94,11 +94,29 @@ final class TheliaEvents
*/
const AFTER_CHANGECUSTOMER = "action.after_changecustomer";
+
/**
* Sent once the category creation form has been successfully validated, and before category insertion in the database.
*/
const BEFORE_CREATECATEGORY = "action.before_createcategory";
+ /**
+ * Create, change or delete a category
+ */
+ const CATEGORY_CREATE = "action.createCategory";
+ const CATEGORY_MODIFY = "action.modifyCategory";
+ const CATEGORY_DELETE = "action.deleteCategory";
+
+ /**
+ * Toggle category visibility
+ */
+ const CATEGORY_TOGGLE_VISIBILITY = "action.toggleCategoryVisibility";
+
+ /**
+ * Change category position
+ */
+ const CATEGORY_CHANGE_POSITION = "action.changeCategoryPosition";
+
/**
* Sent just after a successful insert of a new category in the database.
*/
@@ -113,6 +131,11 @@ final class TheliaEvents
*/
const AFTER_DELETECATEGORY = "action.after_deletecategory";
+ /**
+ * Sent just before a successful change of a category in the database.
+ */
+ const BEFORE_CHANGECATEGORY = "action.before_changecategory";
+
/**
* Sent just after a successful change of a category in the database.
*/
@@ -154,5 +177,4 @@ final class TheliaEvents
* Sent on cimage cache clear request
*/
const IMAGE_CLEAR_CACHE = "action.clearImageCache";
-
}
diff --git a/core/lib/Thelia/Core/Security/SecurityContext.php b/core/lib/Thelia/Core/Security/SecurityContext.php
index 9df25de9e..c09945f61 100755
--- a/core/lib/Thelia/Core/Security/SecurityContext.php
+++ b/core/lib/Thelia/Core/Security/SecurityContext.php
@@ -33,36 +33,11 @@ use Thelia\Core\HttpFoundation\Request;
*/
class SecurityContext
{
- const CONTEXT_FRONT_OFFICE = 'front';
- const CONTEXT_BACK_OFFICE = 'admin';
-
private $request;
- private $context;
public function __construct(Request $request)
{
$this->request = $request;
-
- $this->context = null;
- }
-
- public function setContext($context)
- {
- if ($context !== self::CONTEXT_FRONT_OFFICE && $context !== self::CONTEXT_BACK_OFFICE) {
- throw new \InvalidArgumentException(sprintf("Invalid or empty context identifier '%s'", $context));
- }
-
- $this->context = $context;
-
- return $this;
- }
-
- public function getContext($exception_if_context_undefined = false)
- {
- if (null === $this->context && $exception_if_context_undefined === true)
- throw new \LogicException("No context defined. Please use setContext() first.");
-
- return $this->context;
}
private function getSession()
@@ -76,28 +51,47 @@ class SecurityContext
}
/**
- * Gets the currently authenticated user in the current context, or null if none is defined
+ * Gets the currently authenticated user in the admin, or null if none is defined
*
* @return UserInterface|null A UserInterface instance or null if no user is available
*/
- public function getUser()
+ public function getAdminUser()
{
- $context = $this->getContext(true);
-
- if ($context === self::CONTEXT_FRONT_OFFICE)
- $user = $this->getSession()->getCustomerUser();
- else if ($context == self::CONTEXT_BACK_OFFICE)
- $user = $this->getSession()->getAdminUser();
- else
- $user = null;
-
- return $user;
+ return $this->getSession()->getAdminUser();
}
- final public function isAuthenticated()
+ /**
+ * Gets the currently authenticated customer, or null if none is defined
+ *
+ * @return UserInterface|null A UserInterface instance or null if no user is available
+ */
+ public function getCustomerUser()
{
- if (null !== $this->getUser()) {
- return true;
+ return $this->getSession()->getCustomerUser();
+ }
+
+ /**
+ * Check if a user has at least one of the required roles
+ *
+ * @param UserInterface $user the user
+ * @param array $roles the roles
+ * @return boolean true if the user has the required role, false otherwise
+ */
+ final public function hasRequiredRole($user, array $roles) {
+
+ if ($user != null) {
+ // Check if user's roles matches required roles
+ $userRoles = $user->getRoles();
+
+ $roleFound = false;
+
+ foreach ($userRoles as $role) {
+ if (in_array($role, $roles)) {
+ $roleFound = true;
+
+ return true;
+ }
+ }
}
return false;
@@ -110,85 +104,88 @@ class SecurityContext
*/
final public function isGranted(array $roles, array $permissions)
{
- if ($this->isAuthenticated() === true) {
+ // Find a user which matches the required roles.
+ $user = $this->getCustomerUser();
- $user = $this->getUser();
+ if (! $this->hasRequiredRole($user, $roles)) {
+ $user = $this->getAdminUser();
- // Check if user's roles matches required roles
- $userRoles = $user->getRoles();
+ if (! $this->hasRequiredRole($user, $roles)) {
+ $user = null;
+ }
+ }
- $roleFound = false;
+ if ($user != null) {
- foreach ($userRoles as $role) {
- if (in_array($role, $roles)) {
- $roleFound = true;
-
- break;
- }
+ if (empty($permissions)) {
+ return true;
}
- if ($roleFound) {
+ // Get permissions from profile
+ // $userPermissions = $user->getPermissions(); FIXME
- if (empty($permissions)) {
- return true;
- }
+ // TODO: Finalize permissions system !;
- // Get permissions from profile
- // $userPermissions = $user->getPermissions(); FIXME
+ $userPermissions = array('*'); // FIXME !
- // TODO: Finalize permissions system !;
+ $permissionsFound = true;
- $userPermissions = array('*'); // FIXME !
+ // User have all permissions ?
+ if (in_array('*', $userPermissions))
+ return true;
- $permissionsFound = true;
+ // Check that user's permissions matches required permissions
+ foreach ($permissions as $permission) {
+ if (! in_array($permission, $userPermissions)) {
+ $permissionsFound = false;
- // User have all permissions ?
- if (in_array('*', $userPermissions))
- return true;
-
- // Check that user's permissions matches required permissions
- foreach ($permissions as $permission) {
- if (! in_array($permission, $userPermissions)) {
- $permissionsFound = false;
-
- break;
- }
- }
-
- return $permissionsFound;
+ break;
+ }
}
+
+ return $permissionsFound;
}
return false;
}
/**
- * Sets the authenticated user.
+ * Sets the authenticated admin user.
*
* @param UserInterface $user A UserInterface, or null if no further user should be stored
*/
- public function setUser(UserInterface $user)
+ public function setAdminUser(UserInterface $user)
{
- $context = $this->getContext(true);
-
$user->eraseCredentials();
- if ($context === self::CONTEXT_FRONT_OFFICE)
- $this->getSession()->setCustomerUser($user);
- else if ($context == self::CONTEXT_BACK_OFFICE)
- $this->getSession()->setAdminUser($user);
+ $this->getSession()->setAdminUser($user);
}
/**
- * Clear the user from the security context
+ * Sets the authenticated customer user.
+ *
+ * @param UserInterface $user A UserInterface, or null if no further user should be stored
*/
- public function clear()
+ public function setCustomerUser(UserInterface $user)
{
- $context = $this->getContext(true);
+ $user->eraseCredentials();
- if ($context === self::CONTEXT_FRONT_OFFICE)
- $this->getSession()->clearCustomerUser();
- else if ($context == self::CONTEXT_BACK_OFFICE)
- $this->getSession()->clearAdminUser();
+ $this->getSession()->setCustomerUser($user);
}
-}
+
+ /**
+ * Clear the customer from the security context
+ */
+ public function clearCustomerUser()
+ {
+ $this->getSession()->clearCustomerUser();
+ }
+
+ /**
+ * Clear the admin from the security context
+ */
+ public function clearAdminUser()
+ {
+ $this->getSession()->clearAdminUser();
+ }
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Core/Template/Loop/Auth.php b/core/lib/Thelia/Core/Template/Loop/Auth.php
index b645a0f95..ff9f3cfd3 100755
--- a/core/lib/Thelia/Core/Template/Loop/Auth.php
+++ b/core/lib/Thelia/Core/Template/Loop/Auth.php
@@ -68,15 +68,12 @@ class Auth extends BaseLoop
*/
public function exec(&$pagination)
{
- $context = $this->getContext();
$roles = $this->_explode($this->getRoles());
$permissions = $this->_explode($this->getPermissions());
$loopResult = new LoopResult();
try {
- $this->securityContext->setContext($context);
-
if (true === $this->securityContext->isGranted($roles, $permissions == null ? array() : $permissions)) {
// Create an empty row: loop is no longer empty :)
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
index d9f08bbdf..ee65f34b3 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
@@ -52,7 +52,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
*/
public function adminDataAccess($params, &$smarty)
{
- return $this->userDataAccess("Admin User", SecurityContext::CONTEXT_BACK_OFFICE, $params);
+ return $this->userDataAccess("Admin User", $this->securityContext->getAdminUser(), $params);
}
/**
@@ -64,7 +64,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
*/
public function customerDataAccess($params, &$smarty)
{
- return $this->userDataAccess("Customer User", SecurityContext::CONTEXT_FRONT_OFFICE, $params);
+ return $this->userDataAccess("Customer User", $this->securityContext->getCustomerUser(), $params);
}
/**
@@ -75,12 +75,11 @@ class DataAccessFunctions extends AbstractSmartyPlugin
* @return string the value of the requested attribute
* @throws InvalidArgumentException if the object does not have the requested attribute.
*/
- protected function userDataAccess($objectLabel, $context, $params)
+ protected function userDataAccess($objectLabel, $user, $params)
{
$attribute = $this->getNormalizedParam($params, array('attribute', 'attrib', 'attr'));
if (! empty($attribute)) {
- $user = $this->securityContext->setContext($context)->getUser();
if (null != $user) {
$getter = sprintf("get%s", ucfirst($attribute));
diff --git a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
index eb19d97f5..24d2c29ee 100755
--- a/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
+++ b/core/lib/Thelia/Core/Template/Smarty/Plugins/Security.php
@@ -46,11 +46,6 @@ class Security extends AbstractSmartyPlugin
*/
public function checkAuthFunction($params, &$smarty)
{
- // Context: 'front' or 'admin'
- $context = $this->getNormalizedParam($params, 'context');
-
- $this->securityContext->setContext($context);
-
$roles = $this->_explode($this->getParam($params, 'roles'));
$permissions = $this->_explode($this->getParam($params, 'permissions'));
diff --git a/core/lib/Thelia/Model/Base/Category.php b/core/lib/Thelia/Model/Base/Category.php
index 810283e44..cd36ad47d 100755
--- a/core/lib/Thelia/Model/Base/Category.php
+++ b/core/lib/Thelia/Model/Base/Category.php
@@ -41,8 +41,6 @@ use Thelia\Model\Product as ChildProduct;
use Thelia\Model\ProductCategory as ChildProductCategory;
use Thelia\Model\ProductCategoryQuery as ChildProductCategoryQuery;
use Thelia\Model\ProductQuery as ChildProductQuery;
-use Thelia\Model\Rewriting as ChildRewriting;
-use Thelia\Model\RewritingQuery as ChildRewritingQuery;
use Thelia\Model\Map\CategoryTableMap;
use Thelia\Model\Map\CategoryVersionTableMap;
@@ -153,12 +151,6 @@ abstract class Category implements ActiveRecordInterface
protected $collAttributeCategories;
protected $collAttributeCategoriesPartial;
- /**
- * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects.
- */
- protected $collRewritings;
- protected $collRewritingsPartial;
-
/**
* @var ObjectCollection|ChildCategoryImage[] Collection to store aggregation of ChildCategoryImage objects.
*/
@@ -270,12 +262,6 @@ abstract class Category implements ActiveRecordInterface
*/
protected $attributeCategoriesScheduledForDeletion = null;
- /**
- * An array of objects scheduled for deletion.
- * @var ObjectCollection
- */
- protected $rewritingsScheduledForDeletion = null;
-
/**
* An array of objects scheduled for deletion.
* @var ObjectCollection
@@ -1039,8 +1025,6 @@ abstract class Category implements ActiveRecordInterface
$this->collAttributeCategories = null;
- $this->collRewritings = null;
-
$this->collCategoryImages = null;
$this->collCategoryDocuments = null;
@@ -1331,23 +1315,6 @@ abstract class Category implements ActiveRecordInterface
}
}
- if ($this->rewritingsScheduledForDeletion !== null) {
- if (!$this->rewritingsScheduledForDeletion->isEmpty()) {
- \Thelia\Model\RewritingQuery::create()
- ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false))
- ->delete($con);
- $this->rewritingsScheduledForDeletion = null;
- }
- }
-
- if ($this->collRewritings !== null) {
- foreach ($this->collRewritings as $referrerFK) {
- if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
- $affectedRows += $referrerFK->save($con);
- }
- }
- }
-
if ($this->categoryImagesScheduledForDeletion !== null) {
if (!$this->categoryImagesScheduledForDeletion->isEmpty()) {
\Thelia\Model\CategoryImageQuery::create()
@@ -1668,9 +1635,6 @@ abstract class Category implements ActiveRecordInterface
if (null !== $this->collAttributeCategories) {
$result['AttributeCategories'] = $this->collAttributeCategories->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
- if (null !== $this->collRewritings) {
- $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
- }
if (null !== $this->collCategoryImages) {
$result['CategoryImages'] = $this->collCategoryImages->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
@@ -1895,12 +1859,6 @@ abstract class Category implements ActiveRecordInterface
}
}
- foreach ($this->getRewritings() as $relObj) {
- if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
- $copyObj->addRewriting($relObj->copy($deepCopy));
- }
- }
-
foreach ($this->getCategoryImages() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addCategoryImage($relObj->copy($deepCopy));
@@ -1981,9 +1939,6 @@ abstract class Category implements ActiveRecordInterface
if ('AttributeCategory' == $relationName) {
return $this->initAttributeCategories();
}
- if ('Rewriting' == $relationName) {
- return $this->initRewritings();
- }
if ('CategoryImage' == $relationName) {
return $this->initCategoryImages();
}
@@ -2733,299 +2688,6 @@ abstract class Category implements ActiveRecordInterface
return $this->getAttributeCategories($query, $con);
}
- /**
- * Clears out the collRewritings collection
- *
- * This does not modify the database; however, it will remove any associated objects, causing
- * them to be refetched by subsequent calls to accessor method.
- *
- * @return void
- * @see addRewritings()
- */
- public function clearRewritings()
- {
- $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized
- }
-
- /**
- * Reset is the collRewritings collection loaded partially.
- */
- public function resetPartialRewritings($v = true)
- {
- $this->collRewritingsPartial = $v;
- }
-
- /**
- * Initializes the collRewritings collection.
- *
- * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings());
- * however, you may wish to override this method in your stub class to provide setting appropriate
- * to your application -- for example, setting the initial array to the values stored in database.
- *
- * @param boolean $overrideExisting If set to true, the method call initializes
- * the collection even if it is not empty
- *
- * @return void
- */
- public function initRewritings($overrideExisting = true)
- {
- if (null !== $this->collRewritings && !$overrideExisting) {
- return;
- }
- $this->collRewritings = new ObjectCollection();
- $this->collRewritings->setModel('\Thelia\Model\Rewriting');
- }
-
- /**
- * Gets an array of ChildRewriting objects which contain a foreign key that references this object.
- *
- * If the $criteria is not null, it is used to always fetch the results from the database.
- * Otherwise the results are fetched from the database the first time, then cached.
- * Next time the same method is called without $criteria, the cached collection is returned.
- * If this ChildCategory is new, it will return
- * an empty collection or the current collection; the criteria is ignored on a new object.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- * @throws PropelException
- */
- public function getRewritings($criteria = null, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- // return empty collection
- $this->initRewritings();
- } else {
- $collRewritings = ChildRewritingQuery::create(null, $criteria)
- ->filterByCategory($this)
- ->find($con);
-
- if (null !== $criteria) {
- if (false !== $this->collRewritingsPartial && count($collRewritings)) {
- $this->initRewritings(false);
-
- foreach ($collRewritings as $obj) {
- if (false == $this->collRewritings->contains($obj)) {
- $this->collRewritings->append($obj);
- }
- }
-
- $this->collRewritingsPartial = true;
- }
-
- $collRewritings->getInternalIterator()->rewind();
-
- return $collRewritings;
- }
-
- if ($partial && $this->collRewritings) {
- foreach ($this->collRewritings as $obj) {
- if ($obj->isNew()) {
- $collRewritings[] = $obj;
- }
- }
- }
-
- $this->collRewritings = $collRewritings;
- $this->collRewritingsPartial = false;
- }
- }
-
- return $this->collRewritings;
- }
-
- /**
- * Sets a collection of Rewriting objects related by a one-to-many relationship
- * to the current object.
- * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
- * and new objects from the given Propel collection.
- *
- * @param Collection $rewritings A Propel collection.
- * @param ConnectionInterface $con Optional connection object
- * @return ChildCategory The current object (for fluent API support)
- */
- public function setRewritings(Collection $rewritings, ConnectionInterface $con = null)
- {
- $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings);
-
-
- $this->rewritingsScheduledForDeletion = $rewritingsToDelete;
-
- foreach ($rewritingsToDelete as $rewritingRemoved) {
- $rewritingRemoved->setCategory(null);
- }
-
- $this->collRewritings = null;
- foreach ($rewritings as $rewriting) {
- $this->addRewriting($rewriting);
- }
-
- $this->collRewritings = $rewritings;
- $this->collRewritingsPartial = false;
-
- return $this;
- }
-
- /**
- * Returns the number of related Rewriting objects.
- *
- * @param Criteria $criteria
- * @param boolean $distinct
- * @param ConnectionInterface $con
- * @return int Count of related Rewriting objects.
- * @throws PropelException
- */
- public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- return 0;
- }
-
- if ($partial && !$criteria) {
- return count($this->getRewritings());
- }
-
- $query = ChildRewritingQuery::create(null, $criteria);
- if ($distinct) {
- $query->distinct();
- }
-
- return $query
- ->filterByCategory($this)
- ->count($con);
- }
-
- return count($this->collRewritings);
- }
-
- /**
- * Method called to associate a ChildRewriting object to this object
- * through the ChildRewriting foreign key attribute.
- *
- * @param ChildRewriting $l ChildRewriting
- * @return \Thelia\Model\Category The current object (for fluent API support)
- */
- public function addRewriting(ChildRewriting $l)
- {
- if ($this->collRewritings === null) {
- $this->initRewritings();
- $this->collRewritingsPartial = true;
- }
-
- if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
- $this->doAddRewriting($l);
- }
-
- return $this;
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to add.
- */
- protected function doAddRewriting($rewriting)
- {
- $this->collRewritings[]= $rewriting;
- $rewriting->setCategory($this);
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to remove.
- * @return ChildCategory The current object (for fluent API support)
- */
- public function removeRewriting($rewriting)
- {
- if ($this->getRewritings()->contains($rewriting)) {
- $this->collRewritings->remove($this->collRewritings->search($rewriting));
- if (null === $this->rewritingsScheduledForDeletion) {
- $this->rewritingsScheduledForDeletion = clone $this->collRewritings;
- $this->rewritingsScheduledForDeletion->clear();
- }
- $this->rewritingsScheduledForDeletion[]= $rewriting;
- $rewriting->setCategory(null);
- }
-
- return $this;
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Category is new, it will return
- * an empty collection; or if this Category has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Category.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Product', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Category is new, it will return
- * an empty collection; or if this Category has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Category.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Folder', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Category is new, it will return
- * an empty collection; or if this Category has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Category.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Content', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
/**
* Clears out the collCategoryImages collection
*
@@ -4749,11 +4411,6 @@ abstract class Category implements ActiveRecordInterface
$o->clearAllReferences($deep);
}
}
- if ($this->collRewritings) {
- foreach ($this->collRewritings as $o) {
- $o->clearAllReferences($deep);
- }
- }
if ($this->collCategoryImages) {
foreach ($this->collCategoryImages as $o) {
$o->clearAllReferences($deep);
@@ -4812,10 +4469,6 @@ abstract class Category implements ActiveRecordInterface
$this->collAttributeCategories->clearIterator();
}
$this->collAttributeCategories = null;
- if ($this->collRewritings instanceof Collection) {
- $this->collRewritings->clearIterator();
- }
- $this->collRewritings = null;
if ($this->collCategoryImages instanceof Collection) {
$this->collCategoryImages->clearIterator();
}
diff --git a/core/lib/Thelia/Model/Base/CategoryQuery.php b/core/lib/Thelia/Model/Base/CategoryQuery.php
index 4c823a223..1fe81871b 100755
--- a/core/lib/Thelia/Model/Base/CategoryQuery.php
+++ b/core/lib/Thelia/Model/Base/CategoryQuery.php
@@ -58,10 +58,6 @@ use Thelia\Model\Map\CategoryTableMap;
* @method ChildCategoryQuery rightJoinAttributeCategory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AttributeCategory relation
* @method ChildCategoryQuery innerJoinAttributeCategory($relationAlias = null) Adds a INNER JOIN clause to the query using the AttributeCategory relation
*
- * @method ChildCategoryQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation
- * @method ChildCategoryQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation
- * @method ChildCategoryQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation
- *
* @method ChildCategoryQuery leftJoinCategoryImage($relationAlias = null) Adds a LEFT JOIN clause to the query using the CategoryImage relation
* @method ChildCategoryQuery rightJoinCategoryImage($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CategoryImage relation
* @method ChildCategoryQuery innerJoinCategoryImage($relationAlias = null) Adds a INNER JOIN clause to the query using the CategoryImage relation
@@ -870,79 +866,6 @@ abstract class CategoryQuery extends ModelCriteria
->useQuery($relationAlias ? $relationAlias : 'AttributeCategory', '\Thelia\Model\AttributeCategoryQuery');
}
- /**
- * Filter the query by a related \Thelia\Model\Rewriting object
- *
- * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function filterByRewriting($rewriting, $comparison = null)
- {
- if ($rewriting instanceof \Thelia\Model\Rewriting) {
- return $this
- ->addUsingAlias(CategoryTableMap::ID, $rewriting->getCategoryId(), $comparison);
- } elseif ($rewriting instanceof ObjectCollection) {
- return $this
- ->useRewritingQuery()
- ->filterByPrimaryKeys($rewriting->getPrimaryKeys())
- ->endUse();
- } else {
- throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Rewriting relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildCategoryQuery The current query, for fluid interface
- */
- public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Rewriting');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Rewriting');
- }
-
- return $this;
- }
-
- /**
- * Use the Rewriting relation Rewriting object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query
- */
- public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinRewriting($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery');
- }
-
/**
* Filter the query by a related \Thelia\Model\CategoryImage object
*
diff --git a/core/lib/Thelia/Model/Base/Content.php b/core/lib/Thelia/Model/Base/Content.php
index e46d82ac4..0078502f6 100755
--- a/core/lib/Thelia/Model/Base/Content.php
+++ b/core/lib/Thelia/Model/Base/Content.php
@@ -35,8 +35,6 @@ use Thelia\Model\Folder as ChildFolder;
use Thelia\Model\FolderQuery as ChildFolderQuery;
use Thelia\Model\ProductAssociatedContent as ChildProductAssociatedContent;
use Thelia\Model\ProductAssociatedContentQuery as ChildProductAssociatedContentQuery;
-use Thelia\Model\Rewriting as ChildRewriting;
-use Thelia\Model\RewritingQuery as ChildRewritingQuery;
use Thelia\Model\Map\ContentTableMap;
use Thelia\Model\Map\ContentVersionTableMap;
@@ -123,12 +121,6 @@ abstract class Content implements ActiveRecordInterface
*/
protected $version_created_by;
- /**
- * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects.
- */
- protected $collRewritings;
- protected $collRewritingsPartial;
-
/**
* @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects.
*/
@@ -212,12 +204,6 @@ abstract class Content implements ActiveRecordInterface
*/
protected $foldersScheduledForDeletion = null;
- /**
- * An array of objects scheduled for deletion.
- * @var ObjectCollection
- */
- protected $rewritingsScheduledForDeletion = null;
-
/**
* An array of objects scheduled for deletion.
* @var ObjectCollection
@@ -952,8 +938,6 @@ abstract class Content implements ActiveRecordInterface
if ($deep) { // also de-associate any related objects?
- $this->collRewritings = null;
-
$this->collContentFolders = null;
$this->collContentImages = null;
@@ -1141,23 +1125,6 @@ abstract class Content implements ActiveRecordInterface
}
}
- if ($this->rewritingsScheduledForDeletion !== null) {
- if (!$this->rewritingsScheduledForDeletion->isEmpty()) {
- \Thelia\Model\RewritingQuery::create()
- ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false))
- ->delete($con);
- $this->rewritingsScheduledForDeletion = null;
- }
- }
-
- if ($this->collRewritings !== null) {
- foreach ($this->collRewritings as $referrerFK) {
- if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
- $affectedRows += $referrerFK->save($con);
- }
- }
- }
-
if ($this->contentFoldersScheduledForDeletion !== null) {
if (!$this->contentFoldersScheduledForDeletion->isEmpty()) {
\Thelia\Model\ContentFolderQuery::create()
@@ -1493,9 +1460,6 @@ abstract class Content implements ActiveRecordInterface
}
if ($includeForeignObjects) {
- if (null !== $this->collRewritings) {
- $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
- }
if (null !== $this->collContentFolders) {
$result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
@@ -1702,12 +1666,6 @@ abstract class Content implements ActiveRecordInterface
// the getter/setter methods for fkey referrer objects.
$copyObj->setNew(false);
- foreach ($this->getRewritings() as $relObj) {
- if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
- $copyObj->addRewriting($relObj->copy($deepCopy));
- }
- }
-
foreach ($this->getContentFolders() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addContentFolder($relObj->copy($deepCopy));
@@ -1791,9 +1749,6 @@ abstract class Content implements ActiveRecordInterface
*/
public function initRelation($relationName)
{
- if ('Rewriting' == $relationName) {
- return $this->initRewritings();
- }
if ('ContentFolder' == $relationName) {
return $this->initContentFolders();
}
@@ -1817,299 +1772,6 @@ abstract class Content implements ActiveRecordInterface
}
}
- /**
- * Clears out the collRewritings collection
- *
- * This does not modify the database; however, it will remove any associated objects, causing
- * them to be refetched by subsequent calls to accessor method.
- *
- * @return void
- * @see addRewritings()
- */
- public function clearRewritings()
- {
- $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized
- }
-
- /**
- * Reset is the collRewritings collection loaded partially.
- */
- public function resetPartialRewritings($v = true)
- {
- $this->collRewritingsPartial = $v;
- }
-
- /**
- * Initializes the collRewritings collection.
- *
- * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings());
- * however, you may wish to override this method in your stub class to provide setting appropriate
- * to your application -- for example, setting the initial array to the values stored in database.
- *
- * @param boolean $overrideExisting If set to true, the method call initializes
- * the collection even if it is not empty
- *
- * @return void
- */
- public function initRewritings($overrideExisting = true)
- {
- if (null !== $this->collRewritings && !$overrideExisting) {
- return;
- }
- $this->collRewritings = new ObjectCollection();
- $this->collRewritings->setModel('\Thelia\Model\Rewriting');
- }
-
- /**
- * Gets an array of ChildRewriting objects which contain a foreign key that references this object.
- *
- * If the $criteria is not null, it is used to always fetch the results from the database.
- * Otherwise the results are fetched from the database the first time, then cached.
- * Next time the same method is called without $criteria, the cached collection is returned.
- * If this ChildContent is new, it will return
- * an empty collection or the current collection; the criteria is ignored on a new object.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- * @throws PropelException
- */
- public function getRewritings($criteria = null, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- // return empty collection
- $this->initRewritings();
- } else {
- $collRewritings = ChildRewritingQuery::create(null, $criteria)
- ->filterByContent($this)
- ->find($con);
-
- if (null !== $criteria) {
- if (false !== $this->collRewritingsPartial && count($collRewritings)) {
- $this->initRewritings(false);
-
- foreach ($collRewritings as $obj) {
- if (false == $this->collRewritings->contains($obj)) {
- $this->collRewritings->append($obj);
- }
- }
-
- $this->collRewritingsPartial = true;
- }
-
- $collRewritings->getInternalIterator()->rewind();
-
- return $collRewritings;
- }
-
- if ($partial && $this->collRewritings) {
- foreach ($this->collRewritings as $obj) {
- if ($obj->isNew()) {
- $collRewritings[] = $obj;
- }
- }
- }
-
- $this->collRewritings = $collRewritings;
- $this->collRewritingsPartial = false;
- }
- }
-
- return $this->collRewritings;
- }
-
- /**
- * Sets a collection of Rewriting objects related by a one-to-many relationship
- * to the current object.
- * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
- * and new objects from the given Propel collection.
- *
- * @param Collection $rewritings A Propel collection.
- * @param ConnectionInterface $con Optional connection object
- * @return ChildContent The current object (for fluent API support)
- */
- public function setRewritings(Collection $rewritings, ConnectionInterface $con = null)
- {
- $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings);
-
-
- $this->rewritingsScheduledForDeletion = $rewritingsToDelete;
-
- foreach ($rewritingsToDelete as $rewritingRemoved) {
- $rewritingRemoved->setContent(null);
- }
-
- $this->collRewritings = null;
- foreach ($rewritings as $rewriting) {
- $this->addRewriting($rewriting);
- }
-
- $this->collRewritings = $rewritings;
- $this->collRewritingsPartial = false;
-
- return $this;
- }
-
- /**
- * Returns the number of related Rewriting objects.
- *
- * @param Criteria $criteria
- * @param boolean $distinct
- * @param ConnectionInterface $con
- * @return int Count of related Rewriting objects.
- * @throws PropelException
- */
- public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- return 0;
- }
-
- if ($partial && !$criteria) {
- return count($this->getRewritings());
- }
-
- $query = ChildRewritingQuery::create(null, $criteria);
- if ($distinct) {
- $query->distinct();
- }
-
- return $query
- ->filterByContent($this)
- ->count($con);
- }
-
- return count($this->collRewritings);
- }
-
- /**
- * Method called to associate a ChildRewriting object to this object
- * through the ChildRewriting foreign key attribute.
- *
- * @param ChildRewriting $l ChildRewriting
- * @return \Thelia\Model\Content The current object (for fluent API support)
- */
- public function addRewriting(ChildRewriting $l)
- {
- if ($this->collRewritings === null) {
- $this->initRewritings();
- $this->collRewritingsPartial = true;
- }
-
- if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
- $this->doAddRewriting($l);
- }
-
- return $this;
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to add.
- */
- protected function doAddRewriting($rewriting)
- {
- $this->collRewritings[]= $rewriting;
- $rewriting->setContent($this);
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to remove.
- * @return ChildContent The current object (for fluent API support)
- */
- public function removeRewriting($rewriting)
- {
- if ($this->getRewritings()->contains($rewriting)) {
- $this->collRewritings->remove($this->collRewritings->search($rewriting));
- if (null === $this->rewritingsScheduledForDeletion) {
- $this->rewritingsScheduledForDeletion = clone $this->collRewritings;
- $this->rewritingsScheduledForDeletion->clear();
- }
- $this->rewritingsScheduledForDeletion[]= $rewriting;
- $rewriting->setContent(null);
- }
-
- return $this;
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Content is new, it will return
- * an empty collection; or if this Content has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Content.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Product', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Content is new, it will return
- * an empty collection; or if this Content has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Content.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Category', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Content is new, it will return
- * an empty collection; or if this Content has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Content.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Folder', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
/**
* Clears out the collContentFolders collection
*
@@ -3940,11 +3602,6 @@ abstract class Content implements ActiveRecordInterface
public function clearAllReferences($deep = false)
{
if ($deep) {
- if ($this->collRewritings) {
- foreach ($this->collRewritings as $o) {
- $o->clearAllReferences($deep);
- }
- }
if ($this->collContentFolders) {
foreach ($this->collContentFolders as $o) {
$o->clearAllReferences($deep);
@@ -3991,10 +3648,6 @@ abstract class Content implements ActiveRecordInterface
$this->currentLocale = 'en_EN';
$this->currentTranslations = null;
- if ($this->collRewritings instanceof Collection) {
- $this->collRewritings->clearIterator();
- }
- $this->collRewritings = null;
if ($this->collContentFolders instanceof Collection) {
$this->collContentFolders->clearIterator();
}
diff --git a/core/lib/Thelia/Model/Base/ContentQuery.php b/core/lib/Thelia/Model/Base/ContentQuery.php
index d4749ce46..11275cdc6 100755
--- a/core/lib/Thelia/Model/Base/ContentQuery.php
+++ b/core/lib/Thelia/Model/Base/ContentQuery.php
@@ -44,10 +44,6 @@ use Thelia\Model\Map\ContentTableMap;
* @method ChildContentQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
* @method ChildContentQuery innerJoin($relation) Adds a INNER JOIN clause to the query
*
- * @method ChildContentQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation
- * @method ChildContentQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation
- * @method ChildContentQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation
- *
* @method ChildContentQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation
* @method ChildContentQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation
* @method ChildContentQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation
@@ -602,79 +598,6 @@ abstract class ContentQuery extends ModelCriteria
return $this->addUsingAlias(ContentTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison);
}
- /**
- * Filter the query by a related \Thelia\Model\Rewriting object
- *
- * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildContentQuery The current query, for fluid interface
- */
- public function filterByRewriting($rewriting, $comparison = null)
- {
- if ($rewriting instanceof \Thelia\Model\Rewriting) {
- return $this
- ->addUsingAlias(ContentTableMap::ID, $rewriting->getContentId(), $comparison);
- } elseif ($rewriting instanceof ObjectCollection) {
- return $this
- ->useRewritingQuery()
- ->filterByPrimaryKeys($rewriting->getPrimaryKeys())
- ->endUse();
- } else {
- throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Rewriting relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildContentQuery The current query, for fluid interface
- */
- public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Rewriting');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Rewriting');
- }
-
- return $this;
- }
-
- /**
- * Use the Rewriting relation Rewriting object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query
- */
- public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinRewriting($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery');
- }
-
/**
* Filter the query by a related \Thelia\Model\ContentFolder object
*
diff --git a/core/lib/Thelia/Model/Base/Folder.php b/core/lib/Thelia/Model/Base/Folder.php
index 1b0c80d94..5c3e7aaa3 100755
--- a/core/lib/Thelia/Model/Base/Folder.php
+++ b/core/lib/Thelia/Model/Base/Folder.php
@@ -31,8 +31,6 @@ use Thelia\Model\FolderImageQuery as ChildFolderImageQuery;
use Thelia\Model\FolderQuery as ChildFolderQuery;
use Thelia\Model\FolderVersion as ChildFolderVersion;
use Thelia\Model\FolderVersionQuery as ChildFolderVersionQuery;
-use Thelia\Model\Rewriting as ChildRewriting;
-use Thelia\Model\RewritingQuery as ChildRewritingQuery;
use Thelia\Model\Map\FolderTableMap;
use Thelia\Model\Map\FolderVersionTableMap;
@@ -125,12 +123,6 @@ abstract class Folder implements ActiveRecordInterface
*/
protected $version_created_by;
- /**
- * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects.
- */
- protected $collRewritings;
- protected $collRewritingsPartial;
-
/**
* @var ObjectCollection|ChildContentFolder[] Collection to store aggregation of ChildContentFolder objects.
*/
@@ -202,12 +194,6 @@ abstract class Folder implements ActiveRecordInterface
*/
protected $contentsScheduledForDeletion = null;
- /**
- * An array of objects scheduled for deletion.
- * @var ObjectCollection
- */
- protected $rewritingsScheduledForDeletion = null;
-
/**
* An array of objects scheduled for deletion.
* @var ObjectCollection
@@ -965,8 +951,6 @@ abstract class Folder implements ActiveRecordInterface
if ($deep) { // also de-associate any related objects?
- $this->collRewritings = null;
-
$this->collContentFolders = null;
$this->collFolderImages = null;
@@ -1150,23 +1134,6 @@ abstract class Folder implements ActiveRecordInterface
}
}
- if ($this->rewritingsScheduledForDeletion !== null) {
- if (!$this->rewritingsScheduledForDeletion->isEmpty()) {
- \Thelia\Model\RewritingQuery::create()
- ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false))
- ->delete($con);
- $this->rewritingsScheduledForDeletion = null;
- }
- }
-
- if ($this->collRewritings !== null) {
- foreach ($this->collRewritings as $referrerFK) {
- if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
- $affectedRows += $referrerFK->save($con);
- }
- }
- }
-
if ($this->contentFoldersScheduledForDeletion !== null) {
if (!$this->contentFoldersScheduledForDeletion->isEmpty()) {
\Thelia\Model\ContentFolderQuery::create()
@@ -1478,9 +1445,6 @@ abstract class Folder implements ActiveRecordInterface
}
if ($includeForeignObjects) {
- if (null !== $this->collRewritings) {
- $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
- }
if (null !== $this->collContentFolders) {
$result['ContentFolders'] = $this->collContentFolders->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
@@ -1687,12 +1651,6 @@ abstract class Folder implements ActiveRecordInterface
// the getter/setter methods for fkey referrer objects.
$copyObj->setNew(false);
- foreach ($this->getRewritings() as $relObj) {
- if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
- $copyObj->addRewriting($relObj->copy($deepCopy));
- }
- }
-
foreach ($this->getContentFolders() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addContentFolder($relObj->copy($deepCopy));
@@ -1764,9 +1722,6 @@ abstract class Folder implements ActiveRecordInterface
*/
public function initRelation($relationName)
{
- if ('Rewriting' == $relationName) {
- return $this->initRewritings();
- }
if ('ContentFolder' == $relationName) {
return $this->initContentFolders();
}
@@ -1784,299 +1739,6 @@ abstract class Folder implements ActiveRecordInterface
}
}
- /**
- * Clears out the collRewritings collection
- *
- * This does not modify the database; however, it will remove any associated objects, causing
- * them to be refetched by subsequent calls to accessor method.
- *
- * @return void
- * @see addRewritings()
- */
- public function clearRewritings()
- {
- $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized
- }
-
- /**
- * Reset is the collRewritings collection loaded partially.
- */
- public function resetPartialRewritings($v = true)
- {
- $this->collRewritingsPartial = $v;
- }
-
- /**
- * Initializes the collRewritings collection.
- *
- * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings());
- * however, you may wish to override this method in your stub class to provide setting appropriate
- * to your application -- for example, setting the initial array to the values stored in database.
- *
- * @param boolean $overrideExisting If set to true, the method call initializes
- * the collection even if it is not empty
- *
- * @return void
- */
- public function initRewritings($overrideExisting = true)
- {
- if (null !== $this->collRewritings && !$overrideExisting) {
- return;
- }
- $this->collRewritings = new ObjectCollection();
- $this->collRewritings->setModel('\Thelia\Model\Rewriting');
- }
-
- /**
- * Gets an array of ChildRewriting objects which contain a foreign key that references this object.
- *
- * If the $criteria is not null, it is used to always fetch the results from the database.
- * Otherwise the results are fetched from the database the first time, then cached.
- * Next time the same method is called without $criteria, the cached collection is returned.
- * If this ChildFolder is new, it will return
- * an empty collection or the current collection; the criteria is ignored on a new object.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- * @throws PropelException
- */
- public function getRewritings($criteria = null, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- // return empty collection
- $this->initRewritings();
- } else {
- $collRewritings = ChildRewritingQuery::create(null, $criteria)
- ->filterByFolder($this)
- ->find($con);
-
- if (null !== $criteria) {
- if (false !== $this->collRewritingsPartial && count($collRewritings)) {
- $this->initRewritings(false);
-
- foreach ($collRewritings as $obj) {
- if (false == $this->collRewritings->contains($obj)) {
- $this->collRewritings->append($obj);
- }
- }
-
- $this->collRewritingsPartial = true;
- }
-
- $collRewritings->getInternalIterator()->rewind();
-
- return $collRewritings;
- }
-
- if ($partial && $this->collRewritings) {
- foreach ($this->collRewritings as $obj) {
- if ($obj->isNew()) {
- $collRewritings[] = $obj;
- }
- }
- }
-
- $this->collRewritings = $collRewritings;
- $this->collRewritingsPartial = false;
- }
- }
-
- return $this->collRewritings;
- }
-
- /**
- * Sets a collection of Rewriting objects related by a one-to-many relationship
- * to the current object.
- * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
- * and new objects from the given Propel collection.
- *
- * @param Collection $rewritings A Propel collection.
- * @param ConnectionInterface $con Optional connection object
- * @return ChildFolder The current object (for fluent API support)
- */
- public function setRewritings(Collection $rewritings, ConnectionInterface $con = null)
- {
- $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings);
-
-
- $this->rewritingsScheduledForDeletion = $rewritingsToDelete;
-
- foreach ($rewritingsToDelete as $rewritingRemoved) {
- $rewritingRemoved->setFolder(null);
- }
-
- $this->collRewritings = null;
- foreach ($rewritings as $rewriting) {
- $this->addRewriting($rewriting);
- }
-
- $this->collRewritings = $rewritings;
- $this->collRewritingsPartial = false;
-
- return $this;
- }
-
- /**
- * Returns the number of related Rewriting objects.
- *
- * @param Criteria $criteria
- * @param boolean $distinct
- * @param ConnectionInterface $con
- * @return int Count of related Rewriting objects.
- * @throws PropelException
- */
- public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- return 0;
- }
-
- if ($partial && !$criteria) {
- return count($this->getRewritings());
- }
-
- $query = ChildRewritingQuery::create(null, $criteria);
- if ($distinct) {
- $query->distinct();
- }
-
- return $query
- ->filterByFolder($this)
- ->count($con);
- }
-
- return count($this->collRewritings);
- }
-
- /**
- * Method called to associate a ChildRewriting object to this object
- * through the ChildRewriting foreign key attribute.
- *
- * @param ChildRewriting $l ChildRewriting
- * @return \Thelia\Model\Folder The current object (for fluent API support)
- */
- public function addRewriting(ChildRewriting $l)
- {
- if ($this->collRewritings === null) {
- $this->initRewritings();
- $this->collRewritingsPartial = true;
- }
-
- if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
- $this->doAddRewriting($l);
- }
-
- return $this;
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to add.
- */
- protected function doAddRewriting($rewriting)
- {
- $this->collRewritings[]= $rewriting;
- $rewriting->setFolder($this);
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to remove.
- * @return ChildFolder The current object (for fluent API support)
- */
- public function removeRewriting($rewriting)
- {
- if ($this->getRewritings()->contains($rewriting)) {
- $this->collRewritings->remove($this->collRewritings->search($rewriting));
- if (null === $this->rewritingsScheduledForDeletion) {
- $this->rewritingsScheduledForDeletion = clone $this->collRewritings;
- $this->rewritingsScheduledForDeletion->clear();
- }
- $this->rewritingsScheduledForDeletion[]= $rewriting;
- $rewriting->setFolder(null);
- }
-
- return $this;
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Folder is new, it will return
- * an empty collection; or if this Folder has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Folder.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinProduct($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Product', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Folder is new, it will return
- * an empty collection; or if this Folder has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Folder.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Category', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Folder is new, it will return
- * an empty collection; or if this Folder has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Folder.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Content', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
/**
* Clears out the collContentFolders collection
*
@@ -3422,11 +3084,6 @@ abstract class Folder implements ActiveRecordInterface
public function clearAllReferences($deep = false)
{
if ($deep) {
- if ($this->collRewritings) {
- foreach ($this->collRewritings as $o) {
- $o->clearAllReferences($deep);
- }
- }
if ($this->collContentFolders) {
foreach ($this->collContentFolders as $o) {
$o->clearAllReferences($deep);
@@ -3463,10 +3120,6 @@ abstract class Folder implements ActiveRecordInterface
$this->currentLocale = 'en_EN';
$this->currentTranslations = null;
- if ($this->collRewritings instanceof Collection) {
- $this->collRewritings->clearIterator();
- }
- $this->collRewritings = null;
if ($this->collContentFolders instanceof Collection) {
$this->collContentFolders->clearIterator();
}
diff --git a/core/lib/Thelia/Model/Base/FolderQuery.php b/core/lib/Thelia/Model/Base/FolderQuery.php
index 22d2f3735..28f9bc8a3 100755
--- a/core/lib/Thelia/Model/Base/FolderQuery.php
+++ b/core/lib/Thelia/Model/Base/FolderQuery.php
@@ -46,10 +46,6 @@ use Thelia\Model\Map\FolderTableMap;
* @method ChildFolderQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
* @method ChildFolderQuery innerJoin($relation) Adds a INNER JOIN clause to the query
*
- * @method ChildFolderQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation
- * @method ChildFolderQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation
- * @method ChildFolderQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation
- *
* @method ChildFolderQuery leftJoinContentFolder($relationAlias = null) Adds a LEFT JOIN clause to the query using the ContentFolder relation
* @method ChildFolderQuery rightJoinContentFolder($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ContentFolder relation
* @method ChildFolderQuery innerJoinContentFolder($relationAlias = null) Adds a INNER JOIN clause to the query using the ContentFolder relation
@@ -639,79 +635,6 @@ abstract class FolderQuery extends ModelCriteria
return $this->addUsingAlias(FolderTableMap::VERSION_CREATED_BY, $versionCreatedBy, $comparison);
}
- /**
- * Filter the query by a related \Thelia\Model\Rewriting object
- *
- * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildFolderQuery The current query, for fluid interface
- */
- public function filterByRewriting($rewriting, $comparison = null)
- {
- if ($rewriting instanceof \Thelia\Model\Rewriting) {
- return $this
- ->addUsingAlias(FolderTableMap::ID, $rewriting->getFolderId(), $comparison);
- } elseif ($rewriting instanceof ObjectCollection) {
- return $this
- ->useRewritingQuery()
- ->filterByPrimaryKeys($rewriting->getPrimaryKeys())
- ->endUse();
- } else {
- throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Rewriting relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildFolderQuery The current query, for fluid interface
- */
- public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Rewriting');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Rewriting');
- }
-
- return $this;
- }
-
- /**
- * Use the Rewriting relation Rewriting object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query
- */
- public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinRewriting($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery');
- }
-
/**
* Filter the query by a related \Thelia\Model\ContentFolder object
*
diff --git a/core/lib/Thelia/Model/Base/Product.php b/core/lib/Thelia/Model/Base/Product.php
index 707bd0904..ce2e2a645 100755
--- a/core/lib/Thelia/Model/Base/Product.php
+++ b/core/lib/Thelia/Model/Base/Product.php
@@ -41,8 +41,6 @@ use Thelia\Model\ProductSaleElements as ChildProductSaleElements;
use Thelia\Model\ProductSaleElementsQuery as ChildProductSaleElementsQuery;
use Thelia\Model\ProductVersion as ChildProductVersion;
use Thelia\Model\ProductVersionQuery as ChildProductVersionQuery;
-use Thelia\Model\Rewriting as ChildRewriting;
-use Thelia\Model\RewritingQuery as ChildRewritingQuery;
use Thelia\Model\TaxRule as ChildTaxRule;
use Thelia\Model\TaxRuleQuery as ChildTaxRuleQuery;
use Thelia\Model\Map\ProductTableMap;
@@ -191,12 +189,6 @@ abstract class Product implements ActiveRecordInterface
protected $collAccessoriesRelatedByAccessory;
protected $collAccessoriesRelatedByAccessoryPartial;
- /**
- * @var ObjectCollection|ChildRewriting[] Collection to store aggregation of ChildRewriting objects.
- */
- protected $collRewritings;
- protected $collRewritingsPartial;
-
/**
* @var ObjectCollection|ChildCartItem[] Collection to store aggregation of ChildCartItem objects.
*/
@@ -326,12 +318,6 @@ abstract class Product implements ActiveRecordInterface
*/
protected $accessoriesRelatedByAccessoryScheduledForDeletion = null;
- /**
- * An array of objects scheduled for deletion.
- * @var ObjectCollection
- */
- protected $rewritingsScheduledForDeletion = null;
-
/**
* An array of objects scheduled for deletion.
* @var ObjectCollection
@@ -1145,8 +1131,6 @@ abstract class Product implements ActiveRecordInterface
$this->collAccessoriesRelatedByAccessory = null;
- $this->collRewritings = null;
-
$this->collCartItems = null;
$this->collProductAssociatedContents = null;
@@ -1515,23 +1499,6 @@ abstract class Product implements ActiveRecordInterface
}
}
- if ($this->rewritingsScheduledForDeletion !== null) {
- if (!$this->rewritingsScheduledForDeletion->isEmpty()) {
- \Thelia\Model\RewritingQuery::create()
- ->filterByPrimaryKeys($this->rewritingsScheduledForDeletion->getPrimaryKeys(false))
- ->delete($con);
- $this->rewritingsScheduledForDeletion = null;
- }
- }
-
- if ($this->collRewritings !== null) {
- foreach ($this->collRewritings as $referrerFK) {
- if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
- $affectedRows += $referrerFK->save($con);
- }
- }
- }
-
if ($this->cartItemsScheduledForDeletion !== null) {
if (!$this->cartItemsScheduledForDeletion->isEmpty()) {
\Thelia\Model\CartItemQuery::create()
@@ -1860,9 +1827,6 @@ abstract class Product implements ActiveRecordInterface
if (null !== $this->collAccessoriesRelatedByAccessory) {
$result['AccessoriesRelatedByAccessory'] = $this->collAccessoriesRelatedByAccessory->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
- if (null !== $this->collRewritings) {
- $result['Rewritings'] = $this->collRewritings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
- }
if (null !== $this->collCartItems) {
$result['CartItems'] = $this->collCartItems->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
@@ -2114,12 +2078,6 @@ abstract class Product implements ActiveRecordInterface
}
}
- foreach ($this->getRewritings() as $relObj) {
- if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
- $copyObj->addRewriting($relObj->copy($deepCopy));
- }
- }
-
foreach ($this->getCartItems() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addCartItem($relObj->copy($deepCopy));
@@ -2257,9 +2215,6 @@ abstract class Product implements ActiveRecordInterface
if ('AccessoryRelatedByAccessory' == $relationName) {
return $this->initAccessoriesRelatedByAccessory();
}
- if ('Rewriting' == $relationName) {
- return $this->initRewritings();
- }
if ('CartItem' == $relationName) {
return $this->initCartItems();
}
@@ -3878,299 +3833,6 @@ abstract class Product implements ActiveRecordInterface
return $this;
}
- /**
- * Clears out the collRewritings collection
- *
- * This does not modify the database; however, it will remove any associated objects, causing
- * them to be refetched by subsequent calls to accessor method.
- *
- * @return void
- * @see addRewritings()
- */
- public function clearRewritings()
- {
- $this->collRewritings = null; // important to set this to NULL since that means it is uninitialized
- }
-
- /**
- * Reset is the collRewritings collection loaded partially.
- */
- public function resetPartialRewritings($v = true)
- {
- $this->collRewritingsPartial = $v;
- }
-
- /**
- * Initializes the collRewritings collection.
- *
- * By default this just sets the collRewritings collection to an empty array (like clearcollRewritings());
- * however, you may wish to override this method in your stub class to provide setting appropriate
- * to your application -- for example, setting the initial array to the values stored in database.
- *
- * @param boolean $overrideExisting If set to true, the method call initializes
- * the collection even if it is not empty
- *
- * @return void
- */
- public function initRewritings($overrideExisting = true)
- {
- if (null !== $this->collRewritings && !$overrideExisting) {
- return;
- }
- $this->collRewritings = new ObjectCollection();
- $this->collRewritings->setModel('\Thelia\Model\Rewriting');
- }
-
- /**
- * Gets an array of ChildRewriting objects which contain a foreign key that references this object.
- *
- * If the $criteria is not null, it is used to always fetch the results from the database.
- * Otherwise the results are fetched from the database the first time, then cached.
- * Next time the same method is called without $criteria, the cached collection is returned.
- * If this ChildProduct is new, it will return
- * an empty collection or the current collection; the criteria is ignored on a new object.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- * @throws PropelException
- */
- public function getRewritings($criteria = null, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- // return empty collection
- $this->initRewritings();
- } else {
- $collRewritings = ChildRewritingQuery::create(null, $criteria)
- ->filterByProduct($this)
- ->find($con);
-
- if (null !== $criteria) {
- if (false !== $this->collRewritingsPartial && count($collRewritings)) {
- $this->initRewritings(false);
-
- foreach ($collRewritings as $obj) {
- if (false == $this->collRewritings->contains($obj)) {
- $this->collRewritings->append($obj);
- }
- }
-
- $this->collRewritingsPartial = true;
- }
-
- $collRewritings->getInternalIterator()->rewind();
-
- return $collRewritings;
- }
-
- if ($partial && $this->collRewritings) {
- foreach ($this->collRewritings as $obj) {
- if ($obj->isNew()) {
- $collRewritings[] = $obj;
- }
- }
- }
-
- $this->collRewritings = $collRewritings;
- $this->collRewritingsPartial = false;
- }
- }
-
- return $this->collRewritings;
- }
-
- /**
- * Sets a collection of Rewriting objects related by a one-to-many relationship
- * to the current object.
- * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
- * and new objects from the given Propel collection.
- *
- * @param Collection $rewritings A Propel collection.
- * @param ConnectionInterface $con Optional connection object
- * @return ChildProduct The current object (for fluent API support)
- */
- public function setRewritings(Collection $rewritings, ConnectionInterface $con = null)
- {
- $rewritingsToDelete = $this->getRewritings(new Criteria(), $con)->diff($rewritings);
-
-
- $this->rewritingsScheduledForDeletion = $rewritingsToDelete;
-
- foreach ($rewritingsToDelete as $rewritingRemoved) {
- $rewritingRemoved->setProduct(null);
- }
-
- $this->collRewritings = null;
- foreach ($rewritings as $rewriting) {
- $this->addRewriting($rewriting);
- }
-
- $this->collRewritings = $rewritings;
- $this->collRewritingsPartial = false;
-
- return $this;
- }
-
- /**
- * Returns the number of related Rewriting objects.
- *
- * @param Criteria $criteria
- * @param boolean $distinct
- * @param ConnectionInterface $con
- * @return int Count of related Rewriting objects.
- * @throws PropelException
- */
- public function countRewritings(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
- {
- $partial = $this->collRewritingsPartial && !$this->isNew();
- if (null === $this->collRewritings || null !== $criteria || $partial) {
- if ($this->isNew() && null === $this->collRewritings) {
- return 0;
- }
-
- if ($partial && !$criteria) {
- return count($this->getRewritings());
- }
-
- $query = ChildRewritingQuery::create(null, $criteria);
- if ($distinct) {
- $query->distinct();
- }
-
- return $query
- ->filterByProduct($this)
- ->count($con);
- }
-
- return count($this->collRewritings);
- }
-
- /**
- * Method called to associate a ChildRewriting object to this object
- * through the ChildRewriting foreign key attribute.
- *
- * @param ChildRewriting $l ChildRewriting
- * @return \Thelia\Model\Product The current object (for fluent API support)
- */
- public function addRewriting(ChildRewriting $l)
- {
- if ($this->collRewritings === null) {
- $this->initRewritings();
- $this->collRewritingsPartial = true;
- }
-
- if (!in_array($l, $this->collRewritings->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
- $this->doAddRewriting($l);
- }
-
- return $this;
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to add.
- */
- protected function doAddRewriting($rewriting)
- {
- $this->collRewritings[]= $rewriting;
- $rewriting->setProduct($this);
- }
-
- /**
- * @param Rewriting $rewriting The rewriting object to remove.
- * @return ChildProduct The current object (for fluent API support)
- */
- public function removeRewriting($rewriting)
- {
- if ($this->getRewritings()->contains($rewriting)) {
- $this->collRewritings->remove($this->collRewritings->search($rewriting));
- if (null === $this->rewritingsScheduledForDeletion) {
- $this->rewritingsScheduledForDeletion = clone $this->collRewritings;
- $this->rewritingsScheduledForDeletion->clear();
- }
- $this->rewritingsScheduledForDeletion[]= $rewriting;
- $rewriting->setProduct(null);
- }
-
- return $this;
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Product is new, it will return
- * an empty collection; or if this Product has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Product.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinCategory($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Category', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Product is new, it will return
- * an empty collection; or if this Product has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Product.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinFolder($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Folder', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
-
- /**
- * If this collection has already been initialized with
- * an identical criteria, it returns the collection.
- * Otherwise if this Product is new, it will return
- * an empty collection; or if this Product has previously
- * been saved, it will retrieve related Rewritings from storage.
- *
- * This method is protected by default in order to keep the public
- * api reasonable. You can provide public methods for those you
- * actually need in Product.
- *
- * @param Criteria $criteria optional Criteria object to narrow the query
- * @param ConnectionInterface $con optional connection object
- * @param string $joinBehavior optional join type to use (defaults to Criteria::LEFT_JOIN)
- * @return Collection|ChildRewriting[] List of ChildRewriting objects
- */
- public function getRewritingsJoinContent($criteria = null, $con = null, $joinBehavior = Criteria::LEFT_JOIN)
- {
- $query = ChildRewritingQuery::create(null, $criteria);
- $query->joinWith('Content', $joinBehavior);
-
- return $this->getRewritings($query, $con);
- }
-
/**
* Clears out the collCartItems collection
*
@@ -5747,11 +5409,6 @@ abstract class Product implements ActiveRecordInterface
$o->clearAllReferences($deep);
}
}
- if ($this->collRewritings) {
- foreach ($this->collRewritings as $o) {
- $o->clearAllReferences($deep);
- }
- }
if ($this->collCartItems) {
foreach ($this->collCartItems as $o) {
$o->clearAllReferences($deep);
@@ -5821,10 +5478,6 @@ abstract class Product implements ActiveRecordInterface
$this->collAccessoriesRelatedByAccessory->clearIterator();
}
$this->collAccessoriesRelatedByAccessory = null;
- if ($this->collRewritings instanceof Collection) {
- $this->collRewritings->clearIterator();
- }
- $this->collRewritings = null;
if ($this->collCartItems instanceof Collection) {
$this->collCartItems->clearIterator();
}
diff --git a/core/lib/Thelia/Model/Base/ProductQuery.php b/core/lib/Thelia/Model/Base/ProductQuery.php
index 8a4d4ed18..3254bb08b 100755
--- a/core/lib/Thelia/Model/Base/ProductQuery.php
+++ b/core/lib/Thelia/Model/Base/ProductQuery.php
@@ -80,10 +80,6 @@ use Thelia\Model\Map\ProductTableMap;
* @method ChildProductQuery rightJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the AccessoryRelatedByAccessory relation
* @method ChildProductQuery innerJoinAccessoryRelatedByAccessory($relationAlias = null) Adds a INNER JOIN clause to the query using the AccessoryRelatedByAccessory relation
*
- * @method ChildProductQuery leftJoinRewriting($relationAlias = null) Adds a LEFT JOIN clause to the query using the Rewriting relation
- * @method ChildProductQuery rightJoinRewriting($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Rewriting relation
- * @method ChildProductQuery innerJoinRewriting($relationAlias = null) Adds a INNER JOIN clause to the query using the Rewriting relation
- *
* @method ChildProductQuery leftJoinCartItem($relationAlias = null) Adds a LEFT JOIN clause to the query using the CartItem relation
* @method ChildProductQuery rightJoinCartItem($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CartItem relation
* @method ChildProductQuery innerJoinCartItem($relationAlias = null) Adds a INNER JOIN clause to the query using the CartItem relation
@@ -1288,79 +1284,6 @@ abstract class ProductQuery extends ModelCriteria
->useQuery($relationAlias ? $relationAlias : 'AccessoryRelatedByAccessory', '\Thelia\Model\AccessoryQuery');
}
- /**
- * Filter the query by a related \Thelia\Model\Rewriting object
- *
- * @param \Thelia\Model\Rewriting|ObjectCollection $rewriting the related object to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function filterByRewriting($rewriting, $comparison = null)
- {
- if ($rewriting instanceof \Thelia\Model\Rewriting) {
- return $this
- ->addUsingAlias(ProductTableMap::ID, $rewriting->getProductId(), $comparison);
- } elseif ($rewriting instanceof ObjectCollection) {
- return $this
- ->useRewritingQuery()
- ->filterByPrimaryKeys($rewriting->getPrimaryKeys())
- ->endUse();
- } else {
- throw new PropelException('filterByRewriting() only accepts arguments of type \Thelia\Model\Rewriting or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Rewriting relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildProductQuery The current query, for fluid interface
- */
- public function joinRewriting($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Rewriting');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Rewriting');
- }
-
- return $this;
- }
-
- /**
- * Use the Rewriting relation Rewriting object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\RewritingQuery A secondary query class using the current class as primary query
- */
- public function useRewritingQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinRewriting($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Rewriting', '\Thelia\Model\RewritingQuery');
- }
-
/**
* Filter the query by a related \Thelia\Model\CartItem object
*
diff --git a/core/lib/Thelia/Model/Base/Rewriting.php b/core/lib/Thelia/Model/Base/RewritingArgument.php
old mode 100755
new mode 100644
similarity index 61%
rename from core/lib/Thelia/Model/Base/Rewriting.php
rename to core/lib/Thelia/Model/Base/RewritingArgument.php
index 12229c438..e8a3a9a16
--- a/core/lib/Thelia/Model/Base/Rewriting.php
+++ b/core/lib/Thelia/Model/Base/RewritingArgument.php
@@ -16,24 +16,18 @@ use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Parser\AbstractParser;
use Propel\Runtime\Util\PropelDateTime;
-use Thelia\Model\Category as ChildCategory;
-use Thelia\Model\CategoryQuery as ChildCategoryQuery;
-use Thelia\Model\Content as ChildContent;
-use Thelia\Model\ContentQuery as ChildContentQuery;
-use Thelia\Model\Folder as ChildFolder;
-use Thelia\Model\FolderQuery as ChildFolderQuery;
-use Thelia\Model\Product as ChildProduct;
-use Thelia\Model\ProductQuery as ChildProductQuery;
-use Thelia\Model\Rewriting as ChildRewriting;
-use Thelia\Model\RewritingQuery as ChildRewritingQuery;
-use Thelia\Model\Map\RewritingTableMap;
+use Thelia\Model\RewritingArgument as ChildRewritingArgument;
+use Thelia\Model\RewritingArgumentQuery as ChildRewritingArgumentQuery;
+use Thelia\Model\RewritingUrl as ChildRewritingUrl;
+use Thelia\Model\RewritingUrlQuery as ChildRewritingUrlQuery;
+use Thelia\Model\Map\RewritingArgumentTableMap;
-abstract class Rewriting implements ActiveRecordInterface
+abstract class RewritingArgument implements ActiveRecordInterface
{
/**
* TableMap class name
*/
- const TABLE_MAP = '\\Thelia\\Model\\Map\\RewritingTableMap';
+ const TABLE_MAP = '\\Thelia\\Model\\Map\\RewritingArgumentTableMap';
/**
@@ -63,40 +57,22 @@ abstract class Rewriting implements ActiveRecordInterface
protected $virtualColumns = array();
/**
- * The value for the id field.
+ * The value for the rewriting_url_id field.
* @var int
*/
- protected $id;
+ protected $rewriting_url_id;
/**
- * The value for the url field.
+ * The value for the parameter field.
* @var string
*/
- protected $url;
+ protected $parameter;
/**
- * The value for the product_id field.
- * @var int
+ * The value for the value field.
+ * @var string
*/
- protected $product_id;
-
- /**
- * The value for the category_id field.
- * @var int
- */
- protected $category_id;
-
- /**
- * The value for the folder_id field.
- * @var int
- */
- protected $folder_id;
-
- /**
- * The value for the content_id field.
- * @var int
- */
- protected $content_id;
+ protected $value;
/**
* The value for the created_at field.
@@ -111,24 +87,9 @@ abstract class Rewriting implements ActiveRecordInterface
protected $updated_at;
/**
- * @var Product
+ * @var RewritingUrl
*/
- protected $aProduct;
-
- /**
- * @var Category
- */
- protected $aCategory;
-
- /**
- * @var Folder
- */
- protected $aFolder;
-
- /**
- * @var Content
- */
- protected $aContent;
+ protected $aRewritingUrl;
/**
* Flag to prevent endless save loop, if this object is referenced
@@ -139,7 +100,7 @@ abstract class Rewriting implements ActiveRecordInterface
protected $alreadyInSave = false;
/**
- * Initializes internal state of Thelia\Model\Base\Rewriting object.
+ * Initializes internal state of Thelia\Model\Base\RewritingArgument object.
*/
public function __construct()
{
@@ -234,9 +195,9 @@ abstract class Rewriting implements ActiveRecordInterface
}
/**
- * Compares this with another Rewriting instance. If
- * obj is an instance of Rewriting, delegates to
- * equals(Rewriting). Otherwise, returns false.
+ * Compares this with another RewritingArgument instance. If
+ * obj is an instance of RewritingArgument, delegates to
+ * equals(RewritingArgument). Otherwise, returns false.
*
* @param obj The object to compare to.
* @return Whether equal to the object specified.
@@ -317,7 +278,7 @@ abstract class Rewriting implements ActiveRecordInterface
* @param string $name The virtual column name
* @param mixed $value The value to give to the virtual column
*
- * @return Rewriting The current object, for fluid interface
+ * @return RewritingArgument The current object, for fluid interface
*/
public function setVirtualColumn($name, $value)
{
@@ -349,7 +310,7 @@ abstract class Rewriting implements ActiveRecordInterface
* or a format name ('XML', 'YAML', 'JSON', 'CSV')
* @param string $data The source data to import from
*
- * @return Rewriting The current object, for fluid interface
+ * @return RewritingArgument The current object, for fluid interface
*/
public function importFrom($parser, $data)
{
@@ -393,69 +354,36 @@ abstract class Rewriting implements ActiveRecordInterface
}
/**
- * Get the [id] column value.
+ * Get the [rewriting_url_id] column value.
*
* @return int
*/
- public function getId()
+ public function getRewritingUrlId()
{
- return $this->id;
+ return $this->rewriting_url_id;
}
/**
- * Get the [url] column value.
+ * Get the [parameter] column value.
*
* @return string
*/
- public function getUrl()
+ public function getParameter()
{
- return $this->url;
+ return $this->parameter;
}
/**
- * Get the [product_id] column value.
+ * Get the [value] column value.
*
- * @return int
+ * @return string
*/
- public function getProductId()
+ public function getValue()
{
- return $this->product_id;
- }
-
- /**
- * Get the [category_id] column value.
- *
- * @return int
- */
- public function getCategoryId()
- {
-
- return $this->category_id;
- }
-
- /**
- * Get the [folder_id] column value.
- *
- * @return int
- */
- public function getFolderId()
- {
-
- return $this->folder_id;
- }
-
- /**
- * Get the [content_id] column value.
- *
- * @return int
- */
- public function getContentId()
- {
-
- return $this->content_id;
+ return $this->value;
}
/**
@@ -499,153 +427,78 @@ abstract class Rewriting implements ActiveRecordInterface
}
/**
- * Set the value of [id] column.
+ * Set the value of [rewriting_url_id] column.
*
* @param int $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
*/
- public function setId($v)
+ public function setRewritingUrlId($v)
{
if ($v !== null) {
$v = (int) $v;
}
- if ($this->id !== $v) {
- $this->id = $v;
- $this->modifiedColumns[] = RewritingTableMap::ID;
+ if ($this->rewriting_url_id !== $v) {
+ $this->rewriting_url_id = $v;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::REWRITING_URL_ID;
+ }
+
+ if ($this->aRewritingUrl !== null && $this->aRewritingUrl->getId() !== $v) {
+ $this->aRewritingUrl = null;
}
return $this;
- } // setId()
+ } // setRewritingUrlId()
/**
- * Set the value of [url] column.
+ * Set the value of [parameter] column.
*
* @param string $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
*/
- public function setUrl($v)
+ public function setParameter($v)
{
if ($v !== null) {
$v = (string) $v;
}
- if ($this->url !== $v) {
- $this->url = $v;
- $this->modifiedColumns[] = RewritingTableMap::URL;
+ if ($this->parameter !== $v) {
+ $this->parameter = $v;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::PARAMETER;
}
return $this;
- } // setUrl()
+ } // setParameter()
/**
- * Set the value of [product_id] column.
+ * Set the value of [value] column.
*
- * @param int $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @param string $v new value
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
*/
- public function setProductId($v)
+ public function setValue($v)
{
if ($v !== null) {
- $v = (int) $v;
+ $v = (string) $v;
}
- if ($this->product_id !== $v) {
- $this->product_id = $v;
- $this->modifiedColumns[] = RewritingTableMap::PRODUCT_ID;
- }
-
- if ($this->aProduct !== null && $this->aProduct->getId() !== $v) {
- $this->aProduct = null;
+ if ($this->value !== $v) {
+ $this->value = $v;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::VALUE;
}
return $this;
- } // setProductId()
-
- /**
- * Set the value of [category_id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- */
- public function setCategoryId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->category_id !== $v) {
- $this->category_id = $v;
- $this->modifiedColumns[] = RewritingTableMap::CATEGORY_ID;
- }
-
- if ($this->aCategory !== null && $this->aCategory->getId() !== $v) {
- $this->aCategory = null;
- }
-
-
- return $this;
- } // setCategoryId()
-
- /**
- * Set the value of [folder_id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- */
- public function setFolderId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->folder_id !== $v) {
- $this->folder_id = $v;
- $this->modifiedColumns[] = RewritingTableMap::FOLDER_ID;
- }
-
- if ($this->aFolder !== null && $this->aFolder->getId() !== $v) {
- $this->aFolder = null;
- }
-
-
- return $this;
- } // setFolderId()
-
- /**
- * Set the value of [content_id] column.
- *
- * @param int $v new value
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- */
- public function setContentId($v)
- {
- if ($v !== null) {
- $v = (int) $v;
- }
-
- if ($this->content_id !== $v) {
- $this->content_id = $v;
- $this->modifiedColumns[] = RewritingTableMap::CONTENT_ID;
- }
-
- if ($this->aContent !== null && $this->aContent->getId() !== $v) {
- $this->aContent = null;
- }
-
-
- return $this;
- } // setContentId()
+ } // setValue()
/**
* Sets the value of [created_at] column to a normalized version of the date/time value specified.
*
* @param mixed $v string, integer (timestamp), or \DateTime value.
* Empty strings are treated as NULL.
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
*/
public function setCreatedAt($v)
{
@@ -653,7 +506,7 @@ abstract class Rewriting implements ActiveRecordInterface
if ($this->created_at !== null || $dt !== null) {
if ($dt !== $this->created_at) {
$this->created_at = $dt;
- $this->modifiedColumns[] = RewritingTableMap::CREATED_AT;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::CREATED_AT;
}
} // if either are not null
@@ -666,7 +519,7 @@ abstract class Rewriting implements ActiveRecordInterface
*
* @param mixed $v string, integer (timestamp), or \DateTime value.
* Empty strings are treated as NULL.
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
*/
public function setUpdatedAt($v)
{
@@ -674,7 +527,7 @@ abstract class Rewriting implements ActiveRecordInterface
if ($this->updated_at !== null || $dt !== null) {
if ($dt !== $this->updated_at) {
$this->updated_at = $dt;
- $this->modifiedColumns[] = RewritingTableMap::UPDATED_AT;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::UPDATED_AT;
}
} // if either are not null
@@ -719,31 +572,22 @@ abstract class Rewriting implements ActiveRecordInterface
try {
- $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : RewritingTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
- $this->id = (null !== $col) ? (int) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : RewritingArgumentTableMap::translateFieldName('RewritingUrlId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->rewriting_url_id = (null !== $col) ? (int) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : RewritingTableMap::translateFieldName('Url', TableMap::TYPE_PHPNAME, $indexType)];
- $this->url = (null !== $col) ? (string) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : RewritingArgumentTableMap::translateFieldName('Parameter', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->parameter = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : RewritingTableMap::translateFieldName('ProductId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->product_id = (null !== $col) ? (int) $col : null;
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : RewritingArgumentTableMap::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->value = (null !== $col) ? (string) $col : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : RewritingTableMap::translateFieldName('CategoryId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->category_id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : RewritingTableMap::translateFieldName('FolderId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->folder_id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : RewritingTableMap::translateFieldName('ContentId', TableMap::TYPE_PHPNAME, $indexType)];
- $this->content_id = (null !== $col) ? (int) $col : null;
-
- $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : RewritingTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : RewritingArgumentTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
$this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
- $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : RewritingTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : RewritingArgumentTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
if ($col === '0000-00-00 00:00:00') {
$col = null;
}
@@ -756,10 +600,10 @@ abstract class Rewriting implements ActiveRecordInterface
$this->ensureConsistency();
}
- return $startcol + 8; // 8 = RewritingTableMap::NUM_HYDRATE_COLUMNS.
+ return $startcol + 5; // 5 = RewritingArgumentTableMap::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) {
- throw new PropelException("Error populating \Thelia\Model\Rewriting object", 0, $e);
+ throw new PropelException("Error populating \Thelia\Model\RewritingArgument object", 0, $e);
}
}
@@ -778,17 +622,8 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function ensureConsistency()
{
- if ($this->aProduct !== null && $this->product_id !== $this->aProduct->getId()) {
- $this->aProduct = null;
- }
- if ($this->aCategory !== null && $this->category_id !== $this->aCategory->getId()) {
- $this->aCategory = null;
- }
- if ($this->aFolder !== null && $this->folder_id !== $this->aFolder->getId()) {
- $this->aFolder = null;
- }
- if ($this->aContent !== null && $this->content_id !== $this->aContent->getId()) {
- $this->aContent = null;
+ if ($this->aRewritingUrl !== null && $this->rewriting_url_id !== $this->aRewritingUrl->getId()) {
+ $this->aRewritingUrl = null;
}
} // ensureConsistency
@@ -813,13 +648,13 @@ abstract class Rewriting implements ActiveRecordInterface
}
if ($con === null) {
- $con = Propel::getServiceContainer()->getReadConnection(RewritingTableMap::DATABASE_NAME);
+ $con = Propel::getServiceContainer()->getReadConnection(RewritingArgumentTableMap::DATABASE_NAME);
}
// We don't need to alter the object instance pool; we're just modifying this instance
// already in the pool.
- $dataFetcher = ChildRewritingQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+ $dataFetcher = ChildRewritingArgumentQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
$row = $dataFetcher->fetch();
$dataFetcher->close();
if (!$row) {
@@ -829,10 +664,7 @@ abstract class Rewriting implements ActiveRecordInterface
if ($deep) { // also de-associate any related objects?
- $this->aProduct = null;
- $this->aCategory = null;
- $this->aFolder = null;
- $this->aContent = null;
+ $this->aRewritingUrl = null;
} // if (deep)
}
@@ -842,8 +674,8 @@ abstract class Rewriting implements ActiveRecordInterface
* @param ConnectionInterface $con
* @return void
* @throws PropelException
- * @see Rewriting::setDeleted()
- * @see Rewriting::isDeleted()
+ * @see RewritingArgument::setDeleted()
+ * @see RewritingArgument::isDeleted()
*/
public function delete(ConnectionInterface $con = null)
{
@@ -852,12 +684,12 @@ abstract class Rewriting implements ActiveRecordInterface
}
if ($con === null) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
}
$con->beginTransaction();
try {
- $deleteQuery = ChildRewritingQuery::create()
+ $deleteQuery = ChildRewritingArgumentQuery::create()
->filterByPrimaryKey($this->getPrimaryKey());
$ret = $this->preDelete($con);
if ($ret) {
@@ -894,7 +726,7 @@ abstract class Rewriting implements ActiveRecordInterface
}
if ($con === null) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
}
$con->beginTransaction();
@@ -904,16 +736,16 @@ abstract class Rewriting implements ActiveRecordInterface
if ($isInsert) {
$ret = $ret && $this->preInsert($con);
// timestampable behavior
- if (!$this->isColumnModified(RewritingTableMap::CREATED_AT)) {
+ if (!$this->isColumnModified(RewritingArgumentTableMap::CREATED_AT)) {
$this->setCreatedAt(time());
}
- if (!$this->isColumnModified(RewritingTableMap::UPDATED_AT)) {
+ if (!$this->isColumnModified(RewritingArgumentTableMap::UPDATED_AT)) {
$this->setUpdatedAt(time());
}
} else {
$ret = $ret && $this->preUpdate($con);
// timestampable behavior
- if ($this->isModified() && !$this->isColumnModified(RewritingTableMap::UPDATED_AT)) {
+ if ($this->isModified() && !$this->isColumnModified(RewritingArgumentTableMap::UPDATED_AT)) {
$this->setUpdatedAt(time());
}
}
@@ -925,7 +757,7 @@ abstract class Rewriting implements ActiveRecordInterface
$this->postUpdate($con);
}
$this->postSave($con);
- RewritingTableMap::addInstanceToPool($this);
+ RewritingArgumentTableMap::addInstanceToPool($this);
} else {
$affectedRows = 0;
}
@@ -960,32 +792,11 @@ abstract class Rewriting implements ActiveRecordInterface
// method. This object relates to these object(s) by a
// foreign key reference.
- if ($this->aProduct !== null) {
- if ($this->aProduct->isModified() || $this->aProduct->isNew()) {
- $affectedRows += $this->aProduct->save($con);
+ if ($this->aRewritingUrl !== null) {
+ if ($this->aRewritingUrl->isModified() || $this->aRewritingUrl->isNew()) {
+ $affectedRows += $this->aRewritingUrl->save($con);
}
- $this->setProduct($this->aProduct);
- }
-
- if ($this->aCategory !== null) {
- if ($this->aCategory->isModified() || $this->aCategory->isNew()) {
- $affectedRows += $this->aCategory->save($con);
- }
- $this->setCategory($this->aCategory);
- }
-
- if ($this->aFolder !== null) {
- if ($this->aFolder->isModified() || $this->aFolder->isNew()) {
- $affectedRows += $this->aFolder->save($con);
- }
- $this->setFolder($this->aFolder);
- }
-
- if ($this->aContent !== null) {
- if ($this->aContent->isModified() || $this->aContent->isNew()) {
- $affectedRows += $this->aContent->save($con);
- }
- $this->setContent($this->aContent);
+ $this->setRewritingUrl($this->aRewritingUrl);
}
if ($this->isNew() || $this->isModified()) {
@@ -1021,33 +832,24 @@ abstract class Rewriting implements ActiveRecordInterface
// check the columns in natural order for more readable SQL queries
- if ($this->isColumnModified(RewritingTableMap::ID)) {
- $modifiedColumns[':p' . $index++] = 'ID';
+ if ($this->isColumnModified(RewritingArgumentTableMap::REWRITING_URL_ID)) {
+ $modifiedColumns[':p' . $index++] = 'REWRITING_URL_ID';
}
- if ($this->isColumnModified(RewritingTableMap::URL)) {
- $modifiedColumns[':p' . $index++] = 'URL';
+ if ($this->isColumnModified(RewritingArgumentTableMap::PARAMETER)) {
+ $modifiedColumns[':p' . $index++] = 'PARAMETER';
}
- if ($this->isColumnModified(RewritingTableMap::PRODUCT_ID)) {
- $modifiedColumns[':p' . $index++] = 'PRODUCT_ID';
+ if ($this->isColumnModified(RewritingArgumentTableMap::VALUE)) {
+ $modifiedColumns[':p' . $index++] = 'VALUE';
}
- if ($this->isColumnModified(RewritingTableMap::CATEGORY_ID)) {
- $modifiedColumns[':p' . $index++] = 'CATEGORY_ID';
- }
- if ($this->isColumnModified(RewritingTableMap::FOLDER_ID)) {
- $modifiedColumns[':p' . $index++] = 'FOLDER_ID';
- }
- if ($this->isColumnModified(RewritingTableMap::CONTENT_ID)) {
- $modifiedColumns[':p' . $index++] = 'CONTENT_ID';
- }
- if ($this->isColumnModified(RewritingTableMap::CREATED_AT)) {
+ if ($this->isColumnModified(RewritingArgumentTableMap::CREATED_AT)) {
$modifiedColumns[':p' . $index++] = 'CREATED_AT';
}
- if ($this->isColumnModified(RewritingTableMap::UPDATED_AT)) {
+ if ($this->isColumnModified(RewritingArgumentTableMap::UPDATED_AT)) {
$modifiedColumns[':p' . $index++] = 'UPDATED_AT';
}
$sql = sprintf(
- 'INSERT INTO rewriting (%s) VALUES (%s)',
+ 'INSERT INTO rewriting_argument (%s) VALUES (%s)',
implode(', ', $modifiedColumns),
implode(', ', array_keys($modifiedColumns))
);
@@ -1056,23 +858,14 @@ abstract class Rewriting implements ActiveRecordInterface
$stmt = $con->prepare($sql);
foreach ($modifiedColumns as $identifier => $columnName) {
switch ($columnName) {
- case 'ID':
- $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+ case 'REWRITING_URL_ID':
+ $stmt->bindValue($identifier, $this->rewriting_url_id, PDO::PARAM_INT);
break;
- case 'URL':
- $stmt->bindValue($identifier, $this->url, PDO::PARAM_STR);
+ case 'PARAMETER':
+ $stmt->bindValue($identifier, $this->parameter, PDO::PARAM_STR);
break;
- case 'PRODUCT_ID':
- $stmt->bindValue($identifier, $this->product_id, PDO::PARAM_INT);
- break;
- case 'CATEGORY_ID':
- $stmt->bindValue($identifier, $this->category_id, PDO::PARAM_INT);
- break;
- case 'FOLDER_ID':
- $stmt->bindValue($identifier, $this->folder_id, PDO::PARAM_INT);
- break;
- case 'CONTENT_ID':
- $stmt->bindValue($identifier, $this->content_id, PDO::PARAM_INT);
+ case 'VALUE':
+ $stmt->bindValue($identifier, $this->value, PDO::PARAM_STR);
break;
case 'CREATED_AT':
$stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
@@ -1119,7 +912,7 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function getByName($name, $type = TableMap::TYPE_PHPNAME)
{
- $pos = RewritingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+ $pos = RewritingArgumentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
$field = $this->getByPosition($pos);
return $field;
@@ -1136,27 +929,18 @@ abstract class Rewriting implements ActiveRecordInterface
{
switch ($pos) {
case 0:
- return $this->getId();
+ return $this->getRewritingUrlId();
break;
case 1:
- return $this->getUrl();
+ return $this->getParameter();
break;
case 2:
- return $this->getProductId();
+ return $this->getValue();
break;
case 3:
- return $this->getCategoryId();
- break;
- case 4:
- return $this->getFolderId();
- break;
- case 5:
- return $this->getContentId();
- break;
- case 6:
return $this->getCreatedAt();
break;
- case 7:
+ case 4:
return $this->getUpdatedAt();
break;
default:
@@ -1182,20 +966,17 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
{
- if (isset($alreadyDumpedObjects['Rewriting'][$this->getPrimaryKey()])) {
+ if (isset($alreadyDumpedObjects['RewritingArgument'][serialize($this->getPrimaryKey())])) {
return '*RECURSION*';
}
- $alreadyDumpedObjects['Rewriting'][$this->getPrimaryKey()] = true;
- $keys = RewritingTableMap::getFieldNames($keyType);
+ $alreadyDumpedObjects['RewritingArgument'][serialize($this->getPrimaryKey())] = true;
+ $keys = RewritingArgumentTableMap::getFieldNames($keyType);
$result = array(
- $keys[0] => $this->getId(),
- $keys[1] => $this->getUrl(),
- $keys[2] => $this->getProductId(),
- $keys[3] => $this->getCategoryId(),
- $keys[4] => $this->getFolderId(),
- $keys[5] => $this->getContentId(),
- $keys[6] => $this->getCreatedAt(),
- $keys[7] => $this->getUpdatedAt(),
+ $keys[0] => $this->getRewritingUrlId(),
+ $keys[1] => $this->getParameter(),
+ $keys[2] => $this->getValue(),
+ $keys[3] => $this->getCreatedAt(),
+ $keys[4] => $this->getUpdatedAt(),
);
$virtualColumns = $this->virtualColumns;
foreach($virtualColumns as $key => $virtualColumn)
@@ -1204,17 +985,8 @@ abstract class Rewriting implements ActiveRecordInterface
}
if ($includeForeignObjects) {
- if (null !== $this->aProduct) {
- $result['Product'] = $this->aProduct->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
- }
- if (null !== $this->aCategory) {
- $result['Category'] = $this->aCategory->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
- }
- if (null !== $this->aFolder) {
- $result['Folder'] = $this->aFolder->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
- }
- if (null !== $this->aContent) {
- $result['Content'] = $this->aContent->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ if (null !== $this->aRewritingUrl) {
+ $result['RewritingUrl'] = $this->aRewritingUrl->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
}
}
@@ -1234,7 +1006,7 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
{
- $pos = RewritingTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+ $pos = RewritingArgumentTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
return $this->setByPosition($pos, $value);
}
@@ -1251,27 +1023,18 @@ abstract class Rewriting implements ActiveRecordInterface
{
switch ($pos) {
case 0:
- $this->setId($value);
+ $this->setRewritingUrlId($value);
break;
case 1:
- $this->setUrl($value);
+ $this->setParameter($value);
break;
case 2:
- $this->setProductId($value);
+ $this->setValue($value);
break;
case 3:
- $this->setCategoryId($value);
- break;
- case 4:
- $this->setFolderId($value);
- break;
- case 5:
- $this->setContentId($value);
- break;
- case 6:
$this->setCreatedAt($value);
break;
- case 7:
+ case 4:
$this->setUpdatedAt($value);
break;
} // switch()
@@ -1296,16 +1059,13 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
{
- $keys = RewritingTableMap::getFieldNames($keyType);
+ $keys = RewritingArgumentTableMap::getFieldNames($keyType);
- if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
- if (array_key_exists($keys[1], $arr)) $this->setUrl($arr[$keys[1]]);
- if (array_key_exists($keys[2], $arr)) $this->setProductId($arr[$keys[2]]);
- if (array_key_exists($keys[3], $arr)) $this->setCategoryId($arr[$keys[3]]);
- if (array_key_exists($keys[4], $arr)) $this->setFolderId($arr[$keys[4]]);
- if (array_key_exists($keys[5], $arr)) $this->setContentId($arr[$keys[5]]);
- if (array_key_exists($keys[6], $arr)) $this->setCreatedAt($arr[$keys[6]]);
- if (array_key_exists($keys[7], $arr)) $this->setUpdatedAt($arr[$keys[7]]);
+ if (array_key_exists($keys[0], $arr)) $this->setRewritingUrlId($arr[$keys[0]]);
+ if (array_key_exists($keys[1], $arr)) $this->setParameter($arr[$keys[1]]);
+ if (array_key_exists($keys[2], $arr)) $this->setValue($arr[$keys[2]]);
+ if (array_key_exists($keys[3], $arr)) $this->setCreatedAt($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setUpdatedAt($arr[$keys[4]]);
}
/**
@@ -1315,16 +1075,13 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function buildCriteria()
{
- $criteria = new Criteria(RewritingTableMap::DATABASE_NAME);
+ $criteria = new Criteria(RewritingArgumentTableMap::DATABASE_NAME);
- if ($this->isColumnModified(RewritingTableMap::ID)) $criteria->add(RewritingTableMap::ID, $this->id);
- if ($this->isColumnModified(RewritingTableMap::URL)) $criteria->add(RewritingTableMap::URL, $this->url);
- if ($this->isColumnModified(RewritingTableMap::PRODUCT_ID)) $criteria->add(RewritingTableMap::PRODUCT_ID, $this->product_id);
- if ($this->isColumnModified(RewritingTableMap::CATEGORY_ID)) $criteria->add(RewritingTableMap::CATEGORY_ID, $this->category_id);
- if ($this->isColumnModified(RewritingTableMap::FOLDER_ID)) $criteria->add(RewritingTableMap::FOLDER_ID, $this->folder_id);
- if ($this->isColumnModified(RewritingTableMap::CONTENT_ID)) $criteria->add(RewritingTableMap::CONTENT_ID, $this->content_id);
- if ($this->isColumnModified(RewritingTableMap::CREATED_AT)) $criteria->add(RewritingTableMap::CREATED_AT, $this->created_at);
- if ($this->isColumnModified(RewritingTableMap::UPDATED_AT)) $criteria->add(RewritingTableMap::UPDATED_AT, $this->updated_at);
+ if ($this->isColumnModified(RewritingArgumentTableMap::REWRITING_URL_ID)) $criteria->add(RewritingArgumentTableMap::REWRITING_URL_ID, $this->rewriting_url_id);
+ if ($this->isColumnModified(RewritingArgumentTableMap::PARAMETER)) $criteria->add(RewritingArgumentTableMap::PARAMETER, $this->parameter);
+ if ($this->isColumnModified(RewritingArgumentTableMap::VALUE)) $criteria->add(RewritingArgumentTableMap::VALUE, $this->value);
+ if ($this->isColumnModified(RewritingArgumentTableMap::CREATED_AT)) $criteria->add(RewritingArgumentTableMap::CREATED_AT, $this->created_at);
+ if ($this->isColumnModified(RewritingArgumentTableMap::UPDATED_AT)) $criteria->add(RewritingArgumentTableMap::UPDATED_AT, $this->updated_at);
return $criteria;
}
@@ -1339,30 +1096,40 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function buildPkeyCriteria()
{
- $criteria = new Criteria(RewritingTableMap::DATABASE_NAME);
- $criteria->add(RewritingTableMap::ID, $this->id);
+ $criteria = new Criteria(RewritingArgumentTableMap::DATABASE_NAME);
+ $criteria->add(RewritingArgumentTableMap::REWRITING_URL_ID, $this->rewriting_url_id);
+ $criteria->add(RewritingArgumentTableMap::PARAMETER, $this->parameter);
+ $criteria->add(RewritingArgumentTableMap::VALUE, $this->value);
return $criteria;
}
/**
- * Returns the primary key for this object (row).
- * @return int
+ * Returns the composite primary key for this object.
+ * The array elements will be in same order as specified in XML.
+ * @return array
*/
public function getPrimaryKey()
{
- return $this->getId();
+ $pks = array();
+ $pks[0] = $this->getRewritingUrlId();
+ $pks[1] = $this->getParameter();
+ $pks[2] = $this->getValue();
+
+ return $pks;
}
/**
- * Generic method to set the primary key (id column).
+ * Set the [composite] primary key.
*
- * @param int $key Primary key.
+ * @param array $keys The elements of the composite key (order must match the order in XML file).
* @return void
*/
- public function setPrimaryKey($key)
+ public function setPrimaryKey($keys)
{
- $this->setId($key);
+ $this->setRewritingUrlId($keys[0]);
+ $this->setParameter($keys[1]);
+ $this->setValue($keys[2]);
}
/**
@@ -1372,7 +1139,7 @@ abstract class Rewriting implements ActiveRecordInterface
public function isPrimaryKeyNull()
{
- return null === $this->getId();
+ return (null === $this->getRewritingUrlId()) && (null === $this->getParameter()) && (null === $this->getValue());
}
/**
@@ -1381,19 +1148,16 @@ abstract class Rewriting implements ActiveRecordInterface
* If desired, this method can also make copies of all associated (fkey referrers)
* objects.
*
- * @param object $copyObj An object of \Thelia\Model\Rewriting (or compatible) type.
+ * @param object $copyObj An object of \Thelia\Model\RewritingArgument (or compatible) type.
* @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
* @param boolean $makeNew Whether to reset autoincrement PKs and make the object new.
* @throws PropelException
*/
public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
{
- $copyObj->setId($this->getId());
- $copyObj->setUrl($this->getUrl());
- $copyObj->setProductId($this->getProductId());
- $copyObj->setCategoryId($this->getCategoryId());
- $copyObj->setFolderId($this->getFolderId());
- $copyObj->setContentId($this->getContentId());
+ $copyObj->setRewritingUrlId($this->getRewritingUrlId());
+ $copyObj->setParameter($this->getParameter());
+ $copyObj->setValue($this->getValue());
$copyObj->setCreatedAt($this->getCreatedAt());
$copyObj->setUpdatedAt($this->getUpdatedAt());
if ($makeNew) {
@@ -1410,7 +1174,7 @@ abstract class Rewriting implements ActiveRecordInterface
* objects.
*
* @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
- * @return \Thelia\Model\Rewriting Clone of current object.
+ * @return \Thelia\Model\RewritingArgument Clone of current object.
* @throws PropelException
*/
public function copy($deepCopy = false)
@@ -1424,26 +1188,26 @@ abstract class Rewriting implements ActiveRecordInterface
}
/**
- * Declares an association between this object and a ChildProduct object.
+ * Declares an association between this object and a ChildRewritingUrl object.
*
- * @param ChildProduct $v
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
+ * @param ChildRewritingUrl $v
+ * @return \Thelia\Model\RewritingArgument The current object (for fluent API support)
* @throws PropelException
*/
- public function setProduct(ChildProduct $v = null)
+ public function setRewritingUrl(ChildRewritingUrl $v = null)
{
if ($v === null) {
- $this->setProductId(NULL);
+ $this->setRewritingUrlId(NULL);
} else {
- $this->setProductId($v->getId());
+ $this->setRewritingUrlId($v->getId());
}
- $this->aProduct = $v;
+ $this->aRewritingUrl = $v;
// Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildProduct object, it will not be re-added.
+ // If this object has already been added to the ChildRewritingUrl object, it will not be re-added.
if ($v !== null) {
- $v->addRewriting($this);
+ $v->addRewritingArgument($this);
}
@@ -1452,179 +1216,26 @@ abstract class Rewriting implements ActiveRecordInterface
/**
- * Get the associated ChildProduct object
+ * Get the associated ChildRewritingUrl object
*
* @param ConnectionInterface $con Optional Connection object.
- * @return ChildProduct The associated ChildProduct object.
+ * @return ChildRewritingUrl The associated ChildRewritingUrl object.
* @throws PropelException
*/
- public function getProduct(ConnectionInterface $con = null)
+ public function getRewritingUrl(ConnectionInterface $con = null)
{
- if ($this->aProduct === null && ($this->product_id !== null)) {
- $this->aProduct = ChildProductQuery::create()->findPk($this->product_id, $con);
+ if ($this->aRewritingUrl === null && ($this->rewriting_url_id !== null)) {
+ $this->aRewritingUrl = ChildRewritingUrlQuery::create()->findPk($this->rewriting_url_id, $con);
/* The following can be used additionally to
guarantee the related object contains a reference
to this object. This level of coupling may, however, be
undesirable since it could result in an only partially populated collection
in the referenced object.
- $this->aProduct->addRewritings($this);
+ $this->aRewritingUrl->addRewritingArguments($this);
*/
}
- return $this->aProduct;
- }
-
- /**
- * Declares an association between this object and a ChildCategory object.
- *
- * @param ChildCategory $v
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- * @throws PropelException
- */
- public function setCategory(ChildCategory $v = null)
- {
- if ($v === null) {
- $this->setCategoryId(NULL);
- } else {
- $this->setCategoryId($v->getId());
- }
-
- $this->aCategory = $v;
-
- // Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildCategory object, it will not be re-added.
- if ($v !== null) {
- $v->addRewriting($this);
- }
-
-
- return $this;
- }
-
-
- /**
- * Get the associated ChildCategory object
- *
- * @param ConnectionInterface $con Optional Connection object.
- * @return ChildCategory The associated ChildCategory object.
- * @throws PropelException
- */
- public function getCategory(ConnectionInterface $con = null)
- {
- if ($this->aCategory === null && ($this->category_id !== null)) {
- $this->aCategory = ChildCategoryQuery::create()->findPk($this->category_id, $con);
- /* The following can be used additionally to
- guarantee the related object contains a reference
- to this object. This level of coupling may, however, be
- undesirable since it could result in an only partially populated collection
- in the referenced object.
- $this->aCategory->addRewritings($this);
- */
- }
-
- return $this->aCategory;
- }
-
- /**
- * Declares an association between this object and a ChildFolder object.
- *
- * @param ChildFolder $v
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- * @throws PropelException
- */
- public function setFolder(ChildFolder $v = null)
- {
- if ($v === null) {
- $this->setFolderId(NULL);
- } else {
- $this->setFolderId($v->getId());
- }
-
- $this->aFolder = $v;
-
- // Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildFolder object, it will not be re-added.
- if ($v !== null) {
- $v->addRewriting($this);
- }
-
-
- return $this;
- }
-
-
- /**
- * Get the associated ChildFolder object
- *
- * @param ConnectionInterface $con Optional Connection object.
- * @return ChildFolder The associated ChildFolder object.
- * @throws PropelException
- */
- public function getFolder(ConnectionInterface $con = null)
- {
- if ($this->aFolder === null && ($this->folder_id !== null)) {
- $this->aFolder = ChildFolderQuery::create()->findPk($this->folder_id, $con);
- /* The following can be used additionally to
- guarantee the related object contains a reference
- to this object. This level of coupling may, however, be
- undesirable since it could result in an only partially populated collection
- in the referenced object.
- $this->aFolder->addRewritings($this);
- */
- }
-
- return $this->aFolder;
- }
-
- /**
- * Declares an association between this object and a ChildContent object.
- *
- * @param ChildContent $v
- * @return \Thelia\Model\Rewriting The current object (for fluent API support)
- * @throws PropelException
- */
- public function setContent(ChildContent $v = null)
- {
- if ($v === null) {
- $this->setContentId(NULL);
- } else {
- $this->setContentId($v->getId());
- }
-
- $this->aContent = $v;
-
- // Add binding for other direction of this n:n relationship.
- // If this object has already been added to the ChildContent object, it will not be re-added.
- if ($v !== null) {
- $v->addRewriting($this);
- }
-
-
- return $this;
- }
-
-
- /**
- * Get the associated ChildContent object
- *
- * @param ConnectionInterface $con Optional Connection object.
- * @return ChildContent The associated ChildContent object.
- * @throws PropelException
- */
- public function getContent(ConnectionInterface $con = null)
- {
- if ($this->aContent === null && ($this->content_id !== null)) {
- $this->aContent = ChildContentQuery::create()->findPk($this->content_id, $con);
- /* The following can be used additionally to
- guarantee the related object contains a reference
- to this object. This level of coupling may, however, be
- undesirable since it could result in an only partially populated collection
- in the referenced object.
- $this->aContent->addRewritings($this);
- */
- }
-
- return $this->aContent;
+ return $this->aRewritingUrl;
}
/**
@@ -1632,12 +1243,9 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function clear()
{
- $this->id = null;
- $this->url = null;
- $this->product_id = null;
- $this->category_id = null;
- $this->folder_id = null;
- $this->content_id = null;
+ $this->rewriting_url_id = null;
+ $this->parameter = null;
+ $this->value = null;
$this->created_at = null;
$this->updated_at = null;
$this->alreadyInSave = false;
@@ -1661,10 +1269,7 @@ abstract class Rewriting implements ActiveRecordInterface
if ($deep) {
} // if ($deep)
- $this->aProduct = null;
- $this->aCategory = null;
- $this->aFolder = null;
- $this->aContent = null;
+ $this->aRewritingUrl = null;
}
/**
@@ -1674,7 +1279,7 @@ abstract class Rewriting implements ActiveRecordInterface
*/
public function __toString()
{
- return (string) $this->exportTo(RewritingTableMap::DEFAULT_STRING_FORMAT);
+ return (string) $this->exportTo(RewritingArgumentTableMap::DEFAULT_STRING_FORMAT);
}
// timestampable behavior
@@ -1682,11 +1287,11 @@ abstract class Rewriting implements ActiveRecordInterface
/**
* Mark the current object so that the update date doesn't get updated during next save
*
- * @return ChildRewriting The current object (for fluent API support)
+ * @return ChildRewritingArgument The current object (for fluent API support)
*/
public function keepUpdateDateUnchanged()
{
- $this->modifiedColumns[] = RewritingTableMap::UPDATED_AT;
+ $this->modifiedColumns[] = RewritingArgumentTableMap::UPDATED_AT;
return $this;
}
diff --git a/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php b/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php
new file mode 100644
index 000000000..cd9ca4fd3
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/RewritingArgumentQuery.php
@@ -0,0 +1,673 @@
+setModelAlias($modelAlias);
+ }
+ if ($criteria instanceof Criteria) {
+ $query->mergeWith($criteria);
+ }
+
+ return $query;
+ }
+
+ /**
+ * Find object by primary key.
+ * Propel uses the instance pool to skip the database if the object exists.
+ * Go fast if the query is untouched.
+ *
+ *
+ * $obj = $c->findPk(array(12, 34, 56), $con);
+ *
+ *
+ * @param array[$rewriting_url_id, $parameter, $value] $key Primary key to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ChildRewritingArgument|array|mixed the result, formatted by the current formatter
+ */
+ public function findPk($key, $con = null)
+ {
+ if ($key === null) {
+ return null;
+ }
+ if ((null !== ($obj = RewritingArgumentTableMap::getInstanceFromPool(serialize(array((string) $key[0], (string) $key[1], (string) $key[2]))))) && !$this->formatter) {
+ // the object is already in the instance pool
+ return $obj;
+ }
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getReadConnection(RewritingArgumentTableMap::DATABASE_NAME);
+ }
+ $this->basePreSelect($con);
+ if ($this->formatter || $this->modelAlias || $this->with || $this->select
+ || $this->selectColumns || $this->asColumns || $this->selectModifiers
+ || $this->map || $this->having || $this->joins) {
+ return $this->findPkComplex($key, $con);
+ } else {
+ return $this->findPkSimple($key, $con);
+ }
+ }
+
+ /**
+ * Find object by primary key using raw SQL to go fast.
+ * Bypass doSelect() and the object formatter by using generated code.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildRewritingArgument A model object, or null if the key is not found
+ */
+ protected function findPkSimple($key, $con)
+ {
+ $sql = 'SELECT REWRITING_URL_ID, PARAMETER, VALUE, CREATED_AT, UPDATED_AT FROM rewriting_argument WHERE REWRITING_URL_ID = :p0 AND PARAMETER = :p1 AND VALUE = :p2';
+ try {
+ $stmt = $con->prepare($sql);
+ $stmt->bindValue(':p0', $key[0], PDO::PARAM_INT);
+ $stmt->bindValue(':p1', $key[1], PDO::PARAM_STR);
+ $stmt->bindValue(':p2', $key[2], PDO::PARAM_STR);
+ $stmt->execute();
+ } catch (Exception $e) {
+ Propel::log($e->getMessage(), Propel::LOG_ERR);
+ throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+ }
+ $obj = null;
+ if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+ $obj = new ChildRewritingArgument();
+ $obj->hydrate($row);
+ RewritingArgumentTableMap::addInstanceToPool($obj, serialize(array((string) $key[0], (string) $key[1], (string) $key[2])));
+ }
+ $stmt->closeCursor();
+
+ return $obj;
+ }
+
+ /**
+ * Find object by primary key.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildRewritingArgument|array|mixed the result, formatted by the current formatter
+ */
+ protected function findPkComplex($key, $con)
+ {
+ // As the query uses a PK condition, no limit(1) is necessary.
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKey($key)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+ }
+
+ /**
+ * Find objects by primary key
+ *
+ * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
+ *
+ * @param array $keys Primary keys to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+ */
+ public function findPks($keys, $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+ }
+ $this->basePreSelect($con);
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKeys($keys)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+ }
+
+ /**
+ * Filter the query by primary key
+ *
+ * @param mixed $key Primary key to use for the query
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKey($key)
+ {
+ $this->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $key[0], Criteria::EQUAL);
+ $this->addUsingAlias(RewritingArgumentTableMap::PARAMETER, $key[1], Criteria::EQUAL);
+ $this->addUsingAlias(RewritingArgumentTableMap::VALUE, $key[2], Criteria::EQUAL);
+
+ return $this;
+ }
+
+ /**
+ * Filter the query by a list of primary keys
+ *
+ * @param array $keys The list of primary key to use for the query
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKeys($keys)
+ {
+ if (empty($keys)) {
+ return $this->add(null, '1<>1', Criteria::CUSTOM);
+ }
+ foreach ($keys as $key) {
+ $cton0 = $this->getNewCriterion(RewritingArgumentTableMap::REWRITING_URL_ID, $key[0], Criteria::EQUAL);
+ $cton1 = $this->getNewCriterion(RewritingArgumentTableMap::PARAMETER, $key[1], Criteria::EQUAL);
+ $cton0->addAnd($cton1);
+ $cton2 = $this->getNewCriterion(RewritingArgumentTableMap::VALUE, $key[2], Criteria::EQUAL);
+ $cton0->addAnd($cton2);
+ $this->addOr($cton0);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Filter the query on the rewriting_url_id column
+ *
+ * Example usage:
+ *
+ * $query->filterByRewritingUrlId(1234); // WHERE rewriting_url_id = 1234
+ * $query->filterByRewritingUrlId(array(12, 34)); // WHERE rewriting_url_id IN (12, 34)
+ * $query->filterByRewritingUrlId(array('min' => 12)); // WHERE rewriting_url_id > 12
+ *
+ *
+ * @see filterByRewritingUrl()
+ *
+ * @param mixed $rewritingUrlId The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByRewritingUrlId($rewritingUrlId = null, $comparison = null)
+ {
+ if (is_array($rewritingUrlId)) {
+ $useMinMax = false;
+ if (isset($rewritingUrlId['min'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $rewritingUrlId['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($rewritingUrlId['max'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $rewritingUrlId['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $rewritingUrlId, $comparison);
+ }
+
+ /**
+ * Filter the query on the parameter column
+ *
+ * Example usage:
+ *
+ * $query->filterByParameter('fooValue'); // WHERE parameter = 'fooValue'
+ * $query->filterByParameter('%fooValue%'); // WHERE parameter LIKE '%fooValue%'
+ *
+ *
+ * @param string $parameter The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByParameter($parameter = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($parameter)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $parameter)) {
+ $parameter = str_replace('*', '%', $parameter);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingArgumentTableMap::PARAMETER, $parameter, $comparison);
+ }
+
+ /**
+ * Filter the query on the value column
+ *
+ * Example usage:
+ *
+ * $query->filterByValue('fooValue'); // WHERE value = 'fooValue'
+ * $query->filterByValue('%fooValue%'); // WHERE value LIKE '%fooValue%'
+ *
+ *
+ * @param string $value The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByValue($value = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($value)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $value)) {
+ $value = str_replace('*', '%', $value);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingArgumentTableMap::VALUE, $value, $comparison);
+ }
+
+ /**
+ * Filter the query on the created_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+ *
+ *
+ * @param mixed $createdAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByCreatedAt($createdAt = null, $comparison = null)
+ {
+ if (is_array($createdAt)) {
+ $useMinMax = false;
+ if (isset($createdAt['min'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($createdAt['max'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingArgumentTableMap::CREATED_AT, $createdAt, $comparison);
+ }
+
+ /**
+ * Filter the query on the updated_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+ *
+ *
+ * @param mixed $updatedAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+ {
+ if (is_array($updatedAt)) {
+ $useMinMax = false;
+ if (isset($updatedAt['min'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($updatedAt['max'])) {
+ $this->addUsingAlias(RewritingArgumentTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingArgumentTableMap::UPDATED_AT, $updatedAt, $comparison);
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\RewritingUrl object
+ *
+ * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl The related object(s) to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function filterByRewritingUrl($rewritingUrl, $comparison = null)
+ {
+ if ($rewritingUrl instanceof \Thelia\Model\RewritingUrl) {
+ return $this
+ ->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $rewritingUrl->getId(), $comparison);
+ } elseif ($rewritingUrl instanceof ObjectCollection) {
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+
+ return $this
+ ->addUsingAlias(RewritingArgumentTableMap::REWRITING_URL_ID, $rewritingUrl->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ } else {
+ throw new PropelException('filterByRewritingUrl() only accepts arguments of type \Thelia\Model\RewritingUrl or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the RewritingUrl relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function joinRewritingUrl($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('RewritingUrl');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'RewritingUrl');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the RewritingUrl relation RewritingUrl object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query
+ */
+ public function useRewritingUrlQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinRewritingUrl($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'RewritingUrl', '\Thelia\Model\RewritingUrlQuery');
+ }
+
+ /**
+ * Exclude object from result
+ *
+ * @param ChildRewritingArgument $rewritingArgument Object to remove from the list of results
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function prune($rewritingArgument = null)
+ {
+ if ($rewritingArgument) {
+ $this->addCond('pruneCond0', $this->getAliasedColName(RewritingArgumentTableMap::REWRITING_URL_ID), $rewritingArgument->getRewritingUrlId(), Criteria::NOT_EQUAL);
+ $this->addCond('pruneCond1', $this->getAliasedColName(RewritingArgumentTableMap::PARAMETER), $rewritingArgument->getParameter(), Criteria::NOT_EQUAL);
+ $this->addCond('pruneCond2', $this->getAliasedColName(RewritingArgumentTableMap::VALUE), $rewritingArgument->getValue(), Criteria::NOT_EQUAL);
+ $this->combine(array('pruneCond0', 'pruneCond1', 'pruneCond2'), Criteria::LOGICAL_OR);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Deletes all rows from the rewriting_argument table.
+ *
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver).
+ */
+ public function doDeleteAll(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
+ }
+ $affectedRows = 0; // initialize var to track total num of affected rows
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+ $affectedRows += parent::doDeleteAll($con);
+ // Because this db requires some delete cascade/set null emulation, we have to
+ // clear the cached instance *after* the emulation has happened (since
+ // instances get re-added by the select statement contained therein).
+ RewritingArgumentTableMap::clearInstancePool();
+ RewritingArgumentTableMap::clearRelatedInstancePool();
+
+ $con->commit();
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+
+ return $affectedRows;
+ }
+
+ /**
+ * Performs a DELETE on the database, given a ChildRewritingArgument or Criteria object OR a primary key value.
+ *
+ * @param mixed $values Criteria or ChildRewritingArgument object or primary key or array of primary keys
+ * which is used to create the DELETE statement
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
+ * if supported by native driver or if emulated using Propel.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public function delete(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
+ }
+
+ $criteria = $this;
+
+ // Set the correct dbName
+ $criteria->setDbName(RewritingArgumentTableMap::DATABASE_NAME);
+
+ $affectedRows = 0; // initialize var to track total num of affected rows
+
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+
+
+ RewritingArgumentTableMap::removeInstanceFromPool($criteria);
+
+ $affectedRows += ModelCriteria::delete($con);
+ RewritingArgumentTableMap::clearRelatedInstancePool();
+ $con->commit();
+
+ return $affectedRows;
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ // timestampable behavior
+
+ /**
+ * Filter by the latest updated
+ *
+ * @param int $nbDays Maximum age of the latest update in days
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function recentlyUpdated($nbDays = 7)
+ {
+ return $this->addUsingAlias(RewritingArgumentTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Filter by the latest created
+ *
+ * @param int $nbDays Maximum age of in days
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function recentlyCreated($nbDays = 7)
+ {
+ return $this->addUsingAlias(RewritingArgumentTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Order by update date desc
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function lastUpdatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(RewritingArgumentTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by update date asc
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function firstUpdatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(RewritingArgumentTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by create date desc
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function lastCreatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(RewritingArgumentTableMap::CREATED_AT);
+ }
+
+ /**
+ * Order by create date asc
+ *
+ * @return ChildRewritingArgumentQuery The current query, for fluid interface
+ */
+ public function firstCreatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(RewritingArgumentTableMap::CREATED_AT);
+ }
+
+} // RewritingArgumentQuery
diff --git a/core/lib/Thelia/Model/Base/RewritingQuery.php b/core/lib/Thelia/Model/Base/RewritingQuery.php
deleted file mode 100755
index bf814cfd2..000000000
--- a/core/lib/Thelia/Model/Base/RewritingQuery.php
+++ /dev/null
@@ -1,1044 +0,0 @@
-setModelAlias($modelAlias);
- }
- if ($criteria instanceof Criteria) {
- $query->mergeWith($criteria);
- }
-
- return $query;
- }
-
- /**
- * Find object by primary key.
- * Propel uses the instance pool to skip the database if the object exists.
- * Go fast if the query is untouched.
- *
- *
- * $obj = $c->findPk(12, $con);
- *
- *
- * @param mixed $key Primary key to use for the query
- * @param ConnectionInterface $con an optional connection object
- *
- * @return ChildRewriting|array|mixed the result, formatted by the current formatter
- */
- public function findPk($key, $con = null)
- {
- if ($key === null) {
- return null;
- }
- if ((null !== ($obj = RewritingTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
- // the object is already in the instance pool
- return $obj;
- }
- if ($con === null) {
- $con = Propel::getServiceContainer()->getReadConnection(RewritingTableMap::DATABASE_NAME);
- }
- $this->basePreSelect($con);
- if ($this->formatter || $this->modelAlias || $this->with || $this->select
- || $this->selectColumns || $this->asColumns || $this->selectModifiers
- || $this->map || $this->having || $this->joins) {
- return $this->findPkComplex($key, $con);
- } else {
- return $this->findPkSimple($key, $con);
- }
- }
-
- /**
- * Find object by primary key using raw SQL to go fast.
- * Bypass doSelect() and the object formatter by using generated code.
- *
- * @param mixed $key Primary key to use for the query
- * @param ConnectionInterface $con A connection object
- *
- * @return ChildRewriting A model object, or null if the key is not found
- */
- protected function findPkSimple($key, $con)
- {
- $sql = 'SELECT ID, URL, PRODUCT_ID, CATEGORY_ID, FOLDER_ID, CONTENT_ID, CREATED_AT, UPDATED_AT FROM rewriting WHERE ID = :p0';
- try {
- $stmt = $con->prepare($sql);
- $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
- $stmt->execute();
- } catch (Exception $e) {
- Propel::log($e->getMessage(), Propel::LOG_ERR);
- throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
- }
- $obj = null;
- if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
- $obj = new ChildRewriting();
- $obj->hydrate($row);
- RewritingTableMap::addInstanceToPool($obj, (string) $key);
- }
- $stmt->closeCursor();
-
- return $obj;
- }
-
- /**
- * Find object by primary key.
- *
- * @param mixed $key Primary key to use for the query
- * @param ConnectionInterface $con A connection object
- *
- * @return ChildRewriting|array|mixed the result, formatted by the current formatter
- */
- protected function findPkComplex($key, $con)
- {
- // As the query uses a PK condition, no limit(1) is necessary.
- $criteria = $this->isKeepQuery() ? clone $this : $this;
- $dataFetcher = $criteria
- ->filterByPrimaryKey($key)
- ->doSelect($con);
-
- return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
- }
-
- /**
- * Find objects by primary key
- *
- * $objs = $c->findPks(array(12, 56, 832), $con);
- *
- * @param array $keys Primary keys to use for the query
- * @param ConnectionInterface $con an optional connection object
- *
- * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
- */
- public function findPks($keys, $con = null)
- {
- if (null === $con) {
- $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
- }
- $this->basePreSelect($con);
- $criteria = $this->isKeepQuery() ? clone $this : $this;
- $dataFetcher = $criteria
- ->filterByPrimaryKeys($keys)
- ->doSelect($con);
-
- return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
- }
-
- /**
- * Filter the query by primary key
- *
- * @param mixed $key Primary key to use for the query
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByPrimaryKey($key)
- {
-
- return $this->addUsingAlias(RewritingTableMap::ID, $key, Criteria::EQUAL);
- }
-
- /**
- * Filter the query by a list of primary keys
- *
- * @param array $keys The list of primary key to use for the query
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByPrimaryKeys($keys)
- {
-
- return $this->addUsingAlias(RewritingTableMap::ID, $keys, Criteria::IN);
- }
-
- /**
- * Filter the query on the id column
- *
- * Example usage:
- *
- * $query->filterById(1234); // WHERE id = 1234
- * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
- * $query->filterById(array('min' => 12)); // WHERE id > 12
- *
- *
- * @param mixed $id The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterById($id = null, $comparison = null)
- {
- if (is_array($id)) {
- $useMinMax = false;
- if (isset($id['min'])) {
- $this->addUsingAlias(RewritingTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($id['max'])) {
- $this->addUsingAlias(RewritingTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::ID, $id, $comparison);
- }
-
- /**
- * Filter the query on the url column
- *
- * Example usage:
- *
- * $query->filterByUrl('fooValue'); // WHERE url = 'fooValue'
- * $query->filterByUrl('%fooValue%'); // WHERE url LIKE '%fooValue%'
- *
- *
- * @param string $url The value to use as filter.
- * Accepts wildcards (* and % trigger a LIKE)
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByUrl($url = null, $comparison = null)
- {
- if (null === $comparison) {
- if (is_array($url)) {
- $comparison = Criteria::IN;
- } elseif (preg_match('/[\%\*]/', $url)) {
- $url = str_replace('*', '%', $url);
- $comparison = Criteria::LIKE;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::URL, $url, $comparison);
- }
-
- /**
- * Filter the query on the product_id column
- *
- * Example usage:
- *
- * $query->filterByProductId(1234); // WHERE product_id = 1234
- * $query->filterByProductId(array(12, 34)); // WHERE product_id IN (12, 34)
- * $query->filterByProductId(array('min' => 12)); // WHERE product_id > 12
- *
- *
- * @see filterByProduct()
- *
- * @param mixed $productId The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByProductId($productId = null, $comparison = null)
- {
- if (is_array($productId)) {
- $useMinMax = false;
- if (isset($productId['min'])) {
- $this->addUsingAlias(RewritingTableMap::PRODUCT_ID, $productId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($productId['max'])) {
- $this->addUsingAlias(RewritingTableMap::PRODUCT_ID, $productId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::PRODUCT_ID, $productId, $comparison);
- }
-
- /**
- * Filter the query on the category_id column
- *
- * Example usage:
- *
- * $query->filterByCategoryId(1234); // WHERE category_id = 1234
- * $query->filterByCategoryId(array(12, 34)); // WHERE category_id IN (12, 34)
- * $query->filterByCategoryId(array('min' => 12)); // WHERE category_id > 12
- *
- *
- * @see filterByCategory()
- *
- * @param mixed $categoryId The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByCategoryId($categoryId = null, $comparison = null)
- {
- if (is_array($categoryId)) {
- $useMinMax = false;
- if (isset($categoryId['min'])) {
- $this->addUsingAlias(RewritingTableMap::CATEGORY_ID, $categoryId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($categoryId['max'])) {
- $this->addUsingAlias(RewritingTableMap::CATEGORY_ID, $categoryId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::CATEGORY_ID, $categoryId, $comparison);
- }
-
- /**
- * Filter the query on the folder_id column
- *
- * Example usage:
- *
- * $query->filterByFolderId(1234); // WHERE folder_id = 1234
- * $query->filterByFolderId(array(12, 34)); // WHERE folder_id IN (12, 34)
- * $query->filterByFolderId(array('min' => 12)); // WHERE folder_id > 12
- *
- *
- * @see filterByFolder()
- *
- * @param mixed $folderId The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByFolderId($folderId = null, $comparison = null)
- {
- if (is_array($folderId)) {
- $useMinMax = false;
- if (isset($folderId['min'])) {
- $this->addUsingAlias(RewritingTableMap::FOLDER_ID, $folderId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($folderId['max'])) {
- $this->addUsingAlias(RewritingTableMap::FOLDER_ID, $folderId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::FOLDER_ID, $folderId, $comparison);
- }
-
- /**
- * Filter the query on the content_id column
- *
- * Example usage:
- *
- * $query->filterByContentId(1234); // WHERE content_id = 1234
- * $query->filterByContentId(array(12, 34)); // WHERE content_id IN (12, 34)
- * $query->filterByContentId(array('min' => 12)); // WHERE content_id > 12
- *
- *
- * @see filterByContent()
- *
- * @param mixed $contentId The value to use as filter.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByContentId($contentId = null, $comparison = null)
- {
- if (is_array($contentId)) {
- $useMinMax = false;
- if (isset($contentId['min'])) {
- $this->addUsingAlias(RewritingTableMap::CONTENT_ID, $contentId['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($contentId['max'])) {
- $this->addUsingAlias(RewritingTableMap::CONTENT_ID, $contentId['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::CONTENT_ID, $contentId, $comparison);
- }
-
- /**
- * Filter the query on the created_at column
- *
- * Example usage:
- *
- * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
- * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
- * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
- *
- *
- * @param mixed $createdAt The value to use as filter.
- * Values can be integers (unix timestamps), DateTime objects, or strings.
- * Empty strings are treated as NULL.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByCreatedAt($createdAt = null, $comparison = null)
- {
- if (is_array($createdAt)) {
- $useMinMax = false;
- if (isset($createdAt['min'])) {
- $this->addUsingAlias(RewritingTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($createdAt['max'])) {
- $this->addUsingAlias(RewritingTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::CREATED_AT, $createdAt, $comparison);
- }
-
- /**
- * Filter the query on the updated_at column
- *
- * Example usage:
- *
- * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
- * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
- * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
- *
- *
- * @param mixed $updatedAt The value to use as filter.
- * Values can be integers (unix timestamps), DateTime objects, or strings.
- * Empty strings are treated as NULL.
- * Use scalar values for equality.
- * Use array values for in_array() equivalent.
- * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByUpdatedAt($updatedAt = null, $comparison = null)
- {
- if (is_array($updatedAt)) {
- $useMinMax = false;
- if (isset($updatedAt['min'])) {
- $this->addUsingAlias(RewritingTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
- $useMinMax = true;
- }
- if (isset($updatedAt['max'])) {
- $this->addUsingAlias(RewritingTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
- $useMinMax = true;
- }
- if ($useMinMax) {
- return $this;
- }
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
- }
-
- return $this->addUsingAlias(RewritingTableMap::UPDATED_AT, $updatedAt, $comparison);
- }
-
- /**
- * Filter the query by a related \Thelia\Model\Product object
- *
- * @param \Thelia\Model\Product|ObjectCollection $product The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByProduct($product, $comparison = null)
- {
- if ($product instanceof \Thelia\Model\Product) {
- return $this
- ->addUsingAlias(RewritingTableMap::PRODUCT_ID, $product->getId(), $comparison);
- } elseif ($product instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(RewritingTableMap::PRODUCT_ID, $product->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByProduct() only accepts arguments of type \Thelia\Model\Product or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Product relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function joinProduct($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Product');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Product');
- }
-
- return $this;
- }
-
- /**
- * Use the Product relation Product object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\ProductQuery A secondary query class using the current class as primary query
- */
- public function useProductQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinProduct($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Product', '\Thelia\Model\ProductQuery');
- }
-
- /**
- * Filter the query by a related \Thelia\Model\Category object
- *
- * @param \Thelia\Model\Category|ObjectCollection $category The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByCategory($category, $comparison = null)
- {
- if ($category instanceof \Thelia\Model\Category) {
- return $this
- ->addUsingAlias(RewritingTableMap::CATEGORY_ID, $category->getId(), $comparison);
- } elseif ($category instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(RewritingTableMap::CATEGORY_ID, $category->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByCategory() only accepts arguments of type \Thelia\Model\Category or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Category relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function joinCategory($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Category');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Category');
- }
-
- return $this;
- }
-
- /**
- * Use the Category relation Category object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\CategoryQuery A secondary query class using the current class as primary query
- */
- public function useCategoryQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinCategory($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Category', '\Thelia\Model\CategoryQuery');
- }
-
- /**
- * Filter the query by a related \Thelia\Model\Folder object
- *
- * @param \Thelia\Model\Folder|ObjectCollection $folder The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByFolder($folder, $comparison = null)
- {
- if ($folder instanceof \Thelia\Model\Folder) {
- return $this
- ->addUsingAlias(RewritingTableMap::FOLDER_ID, $folder->getId(), $comparison);
- } elseif ($folder instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(RewritingTableMap::FOLDER_ID, $folder->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByFolder() only accepts arguments of type \Thelia\Model\Folder or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Folder relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function joinFolder($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Folder');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Folder');
- }
-
- return $this;
- }
-
- /**
- * Use the Folder relation Folder object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\FolderQuery A secondary query class using the current class as primary query
- */
- public function useFolderQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinFolder($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Folder', '\Thelia\Model\FolderQuery');
- }
-
- /**
- * Filter the query by a related \Thelia\Model\Content object
- *
- * @param \Thelia\Model\Content|ObjectCollection $content The related object(s) to use as filter
- * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function filterByContent($content, $comparison = null)
- {
- if ($content instanceof \Thelia\Model\Content) {
- return $this
- ->addUsingAlias(RewritingTableMap::CONTENT_ID, $content->getId(), $comparison);
- } elseif ($content instanceof ObjectCollection) {
- if (null === $comparison) {
- $comparison = Criteria::IN;
- }
-
- return $this
- ->addUsingAlias(RewritingTableMap::CONTENT_ID, $content->toKeyValue('PrimaryKey', 'Id'), $comparison);
- } else {
- throw new PropelException('filterByContent() only accepts arguments of type \Thelia\Model\Content or Collection');
- }
- }
-
- /**
- * Adds a JOIN clause to the query using the Content relation
- *
- * @param string $relationAlias optional alias for the relation
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function joinContent($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- $tableMap = $this->getTableMap();
- $relationMap = $tableMap->getRelation('Content');
-
- // create a ModelJoin object for this join
- $join = new ModelJoin();
- $join->setJoinType($joinType);
- $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
- if ($previousJoin = $this->getPreviousJoin()) {
- $join->setPreviousJoin($previousJoin);
- }
-
- // add the ModelJoin to the current object
- if ($relationAlias) {
- $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
- $this->addJoinObject($join, $relationAlias);
- } else {
- $this->addJoinObject($join, 'Content');
- }
-
- return $this;
- }
-
- /**
- * Use the Content relation Content object
- *
- * @see useQuery()
- *
- * @param string $relationAlias optional alias for the relation,
- * to be used as main alias in the secondary query
- * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
- *
- * @return \Thelia\Model\ContentQuery A secondary query class using the current class as primary query
- */
- public function useContentQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
- {
- return $this
- ->joinContent($relationAlias, $joinType)
- ->useQuery($relationAlias ? $relationAlias : 'Content', '\Thelia\Model\ContentQuery');
- }
-
- /**
- * Exclude object from result
- *
- * @param ChildRewriting $rewriting Object to remove from the list of results
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function prune($rewriting = null)
- {
- if ($rewriting) {
- $this->addUsingAlias(RewritingTableMap::ID, $rewriting->getId(), Criteria::NOT_EQUAL);
- }
-
- return $this;
- }
-
- /**
- * Deletes all rows from the rewriting table.
- *
- * @param ConnectionInterface $con the connection to use
- * @return int The number of affected rows (if supported by underlying database driver).
- */
- public function doDeleteAll(ConnectionInterface $con = null)
- {
- if (null === $con) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
- }
- $affectedRows = 0; // initialize var to track total num of affected rows
- try {
- // use transaction because $criteria could contain info
- // for more than one table or we could emulating ON DELETE CASCADE, etc.
- $con->beginTransaction();
- $affectedRows += parent::doDeleteAll($con);
- // Because this db requires some delete cascade/set null emulation, we have to
- // clear the cached instance *after* the emulation has happened (since
- // instances get re-added by the select statement contained therein).
- RewritingTableMap::clearInstancePool();
- RewritingTableMap::clearRelatedInstancePool();
-
- $con->commit();
- } catch (PropelException $e) {
- $con->rollBack();
- throw $e;
- }
-
- return $affectedRows;
- }
-
- /**
- * Performs a DELETE on the database, given a ChildRewriting or Criteria object OR a primary key value.
- *
- * @param mixed $values Criteria or ChildRewriting object or primary key or array of primary keys
- * which is used to create the DELETE statement
- * @param ConnectionInterface $con the connection to use
- * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
- * if supported by native driver or if emulated using Propel.
- * @throws PropelException Any exceptions caught during processing will be
- * rethrown wrapped into a PropelException.
- */
- public function delete(ConnectionInterface $con = null)
- {
- if (null === $con) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
- }
-
- $criteria = $this;
-
- // Set the correct dbName
- $criteria->setDbName(RewritingTableMap::DATABASE_NAME);
-
- $affectedRows = 0; // initialize var to track total num of affected rows
-
- try {
- // use transaction because $criteria could contain info
- // for more than one table or we could emulating ON DELETE CASCADE, etc.
- $con->beginTransaction();
-
-
- RewritingTableMap::removeInstanceFromPool($criteria);
-
- $affectedRows += ModelCriteria::delete($con);
- RewritingTableMap::clearRelatedInstancePool();
- $con->commit();
-
- return $affectedRows;
- } catch (PropelException $e) {
- $con->rollBack();
- throw $e;
- }
- }
-
- // timestampable behavior
-
- /**
- * Filter by the latest updated
- *
- * @param int $nbDays Maximum age of the latest update in days
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function recentlyUpdated($nbDays = 7)
- {
- return $this->addUsingAlias(RewritingTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Filter by the latest created
- *
- * @param int $nbDays Maximum age of in days
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function recentlyCreated($nbDays = 7)
- {
- return $this->addUsingAlias(RewritingTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
- }
-
- /**
- * Order by update date desc
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function lastUpdatedFirst()
- {
- return $this->addDescendingOrderByColumn(RewritingTableMap::UPDATED_AT);
- }
-
- /**
- * Order by update date asc
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function firstUpdatedFirst()
- {
- return $this->addAscendingOrderByColumn(RewritingTableMap::UPDATED_AT);
- }
-
- /**
- * Order by create date desc
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function lastCreatedFirst()
- {
- return $this->addDescendingOrderByColumn(RewritingTableMap::CREATED_AT);
- }
-
- /**
- * Order by create date asc
- *
- * @return ChildRewritingQuery The current query, for fluid interface
- */
- public function firstCreatedFirst()
- {
- return $this->addAscendingOrderByColumn(RewritingTableMap::CREATED_AT);
- }
-
-} // RewritingQuery
diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php
new file mode 100644
index 000000000..75ee97e79
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/RewritingUrl.php
@@ -0,0 +1,2158 @@
+modifiedColumns);
+ }
+
+ /**
+ * Has specified column been modified?
+ *
+ * @param string $col column fully qualified name (TableMap::TYPE_COLNAME), e.g. Book::AUTHOR_ID
+ * @return boolean True if $col has been modified.
+ */
+ public function isColumnModified($col)
+ {
+ return in_array($col, $this->modifiedColumns);
+ }
+
+ /**
+ * Get the columns that have been modified in this object.
+ * @return array A unique list of the modified column names for this object.
+ */
+ public function getModifiedColumns()
+ {
+ return array_unique($this->modifiedColumns);
+ }
+
+ /**
+ * Returns whether the object has ever been saved. This will
+ * be false, if the object was retrieved from storage or was created
+ * and then saved.
+ *
+ * @return true, if the object has never been persisted.
+ */
+ public function isNew()
+ {
+ return $this->new;
+ }
+
+ /**
+ * Setter for the isNew attribute. This method will be called
+ * by Propel-generated children and objects.
+ *
+ * @param boolean $b the state of the object.
+ */
+ public function setNew($b)
+ {
+ $this->new = (Boolean) $b;
+ }
+
+ /**
+ * Whether this object has been deleted.
+ * @return boolean The deleted state of this object.
+ */
+ public function isDeleted()
+ {
+ return $this->deleted;
+ }
+
+ /**
+ * Specify whether this object has been deleted.
+ * @param boolean $b The deleted state of this object.
+ * @return void
+ */
+ public function setDeleted($b)
+ {
+ $this->deleted = (Boolean) $b;
+ }
+
+ /**
+ * Sets the modified state for the object to be false.
+ * @param string $col If supplied, only the specified column is reset.
+ * @return void
+ */
+ public function resetModified($col = null)
+ {
+ if (null !== $col) {
+ while (false !== ($offset = array_search($col, $this->modifiedColumns))) {
+ array_splice($this->modifiedColumns, $offset, 1);
+ }
+ } else {
+ $this->modifiedColumns = array();
+ }
+ }
+
+ /**
+ * Compares this with another RewritingUrl instance. If
+ * obj is an instance of RewritingUrl, delegates to
+ * equals(RewritingUrl). Otherwise, returns false.
+ *
+ * @param obj The object to compare to.
+ * @return Whether equal to the object specified.
+ */
+ public function equals($obj)
+ {
+ $thisclazz = get_class($this);
+ if (!is_object($obj) || !($obj instanceof $thisclazz)) {
+ return false;
+ }
+
+ if ($this === $obj) {
+ return true;
+ }
+
+ if (null === $this->getPrimaryKey()
+ || null === $obj->getPrimaryKey()) {
+ return false;
+ }
+
+ return $this->getPrimaryKey() === $obj->getPrimaryKey();
+ }
+
+ /**
+ * If the primary key is not null, return the hashcode of the
+ * primary key. Otherwise, return the hash code of the object.
+ *
+ * @return int Hashcode
+ */
+ public function hashCode()
+ {
+ if (null !== $this->getPrimaryKey()) {
+ return crc32(serialize($this->getPrimaryKey()));
+ }
+
+ return crc32(serialize(clone $this));
+ }
+
+ /**
+ * Get the associative array of the virtual columns in this object
+ *
+ * @param string $name The virtual column name
+ *
+ * @return array
+ */
+ public function getVirtualColumns()
+ {
+ return $this->virtualColumns;
+ }
+
+ /**
+ * Checks the existence of a virtual column in this object
+ *
+ * @return boolean
+ */
+ public function hasVirtualColumn($name)
+ {
+ return array_key_exists($name, $this->virtualColumns);
+ }
+
+ /**
+ * Get the value of a virtual column in this object
+ *
+ * @return mixed
+ */
+ public function getVirtualColumn($name)
+ {
+ if (!$this->hasVirtualColumn($name)) {
+ throw new PropelException(sprintf('Cannot get value of inexistent virtual column %s.', $name));
+ }
+
+ return $this->virtualColumns[$name];
+ }
+
+ /**
+ * Set the value of a virtual column in this object
+ *
+ * @param string $name The virtual column name
+ * @param mixed $value The value to give to the virtual column
+ *
+ * @return RewritingUrl The current object, for fluid interface
+ */
+ public function setVirtualColumn($name, $value)
+ {
+ $this->virtualColumns[$name] = $value;
+
+ return $this;
+ }
+
+ /**
+ * Logs a message using Propel::log().
+ *
+ * @param string $msg
+ * @param int $priority One of the Propel::LOG_* logging levels
+ * @return boolean
+ */
+ protected function log($msg, $priority = Propel::LOG_INFO)
+ {
+ return Propel::log(get_class($this) . ': ' . $msg, $priority);
+ }
+
+ /**
+ * Populate the current object from a string, using a given parser format
+ *
+ * $book = new Book();
+ * $book->importFrom('JSON', '{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+ *
+ *
+ * @param mixed $parser A AbstractParser instance,
+ * or a format name ('XML', 'YAML', 'JSON', 'CSV')
+ * @param string $data The source data to import from
+ *
+ * @return RewritingUrl The current object, for fluid interface
+ */
+ public function importFrom($parser, $data)
+ {
+ if (!$parser instanceof AbstractParser) {
+ $parser = AbstractParser::getParser($parser);
+ }
+
+ return $this->fromArray($parser->toArray($data), TableMap::TYPE_PHPNAME);
+ }
+
+ /**
+ * Export the current object properties to a string, using a given parser format
+ *
+ * $book = BookQuery::create()->findPk(9012);
+ * echo $book->exportTo('JSON');
+ * => {"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}');
+ *
+ *
+ * @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
+ * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy load(ed) columns. Defaults to TRUE.
+ * @return string The exported data
+ */
+ public function exportTo($parser, $includeLazyLoadColumns = true)
+ {
+ if (!$parser instanceof AbstractParser) {
+ $parser = AbstractParser::getParser($parser);
+ }
+
+ return $parser->fromArray($this->toArray(TableMap::TYPE_PHPNAME, $includeLazyLoadColumns, array(), true));
+ }
+
+ /**
+ * Clean up internal collections prior to serializing
+ * Avoids recursive loops that turn into segmentation faults when serializing
+ */
+ public function __sleep()
+ {
+ $this->clearAllReferences();
+
+ return array_keys(get_object_vars($this));
+ }
+
+ /**
+ * Get the [id] column value.
+ *
+ * @return int
+ */
+ public function getId()
+ {
+
+ return $this->id;
+ }
+
+ /**
+ * Get the [url] column value.
+ *
+ * @return string
+ */
+ public function getUrl()
+ {
+
+ return $this->url;
+ }
+
+ /**
+ * Get the [view] column value.
+ *
+ * @return string
+ */
+ public function getView()
+ {
+
+ return $this->view;
+ }
+
+ /**
+ * Get the [view_id] column value.
+ *
+ * @return string
+ */
+ public function getViewId()
+ {
+
+ return $this->view_id;
+ }
+
+ /**
+ * Get the [view_locale] column value.
+ *
+ * @return string
+ */
+ public function getViewLocale()
+ {
+
+ return $this->view_locale;
+ }
+
+ /**
+ * Get the [redirected] column value.
+ *
+ * @return int
+ */
+ public function getRedirected()
+ {
+
+ return $this->redirected;
+ }
+
+ /**
+ * Get the [optionally formatted] temporal [created_at] column value.
+ *
+ *
+ * @param string $format The date/time format string (either date()-style or strftime()-style).
+ * If format is NULL, then the raw \DateTime object will be returned.
+ *
+ * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+ *
+ * @throws PropelException - if unable to parse/validate the date/time value.
+ */
+ public function getCreatedAt($format = NULL)
+ {
+ if ($format === null) {
+ return $this->created_at;
+ } else {
+ return $this->created_at !== null ? $this->created_at->format($format) : null;
+ }
+ }
+
+ /**
+ * Get the [optionally formatted] temporal [updated_at] column value.
+ *
+ *
+ * @param string $format The date/time format string (either date()-style or strftime()-style).
+ * If format is NULL, then the raw \DateTime object will be returned.
+ *
+ * @return mixed Formatted date/time value as string or \DateTime object (if format is NULL), NULL if column is NULL, and 0 if column value is 0000-00-00 00:00:00
+ *
+ * @throws PropelException - if unable to parse/validate the date/time value.
+ */
+ public function getUpdatedAt($format = NULL)
+ {
+ if ($format === null) {
+ return $this->updated_at;
+ } else {
+ return $this->updated_at !== null ? $this->updated_at->format($format) : null;
+ }
+ }
+
+ /**
+ * Set the value of [id] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setId($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->id !== $v) {
+ $this->id = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::ID;
+ }
+
+
+ return $this;
+ } // setId()
+
+ /**
+ * Set the value of [url] column.
+ *
+ * @param string $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setUrl($v)
+ {
+ if ($v !== null) {
+ $v = (string) $v;
+ }
+
+ if ($this->url !== $v) {
+ $this->url = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::URL;
+ }
+
+
+ return $this;
+ } // setUrl()
+
+ /**
+ * Set the value of [view] column.
+ *
+ * @param string $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setView($v)
+ {
+ if ($v !== null) {
+ $v = (string) $v;
+ }
+
+ if ($this->view !== $v) {
+ $this->view = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::VIEW;
+ }
+
+
+ return $this;
+ } // setView()
+
+ /**
+ * Set the value of [view_id] column.
+ *
+ * @param string $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setViewId($v)
+ {
+ if ($v !== null) {
+ $v = (string) $v;
+ }
+
+ if ($this->view_id !== $v) {
+ $this->view_id = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::VIEW_ID;
+ }
+
+
+ return $this;
+ } // setViewId()
+
+ /**
+ * Set the value of [view_locale] column.
+ *
+ * @param string $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setViewLocale($v)
+ {
+ if ($v !== null) {
+ $v = (string) $v;
+ }
+
+ if ($this->view_locale !== $v) {
+ $this->view_locale = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::VIEW_LOCALE;
+ }
+
+
+ return $this;
+ } // setViewLocale()
+
+ /**
+ * Set the value of [redirected] column.
+ *
+ * @param int $v new value
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setRedirected($v)
+ {
+ if ($v !== null) {
+ $v = (int) $v;
+ }
+
+ if ($this->redirected !== $v) {
+ $this->redirected = $v;
+ $this->modifiedColumns[] = RewritingUrlTableMap::REDIRECTED;
+ }
+
+ if ($this->aRewritingUrlRelatedByRedirected !== null && $this->aRewritingUrlRelatedByRedirected->getId() !== $v) {
+ $this->aRewritingUrlRelatedByRedirected = null;
+ }
+
+
+ return $this;
+ } // setRedirected()
+
+ /**
+ * Sets the value of [created_at] column to a normalized version of the date/time value specified.
+ *
+ * @param mixed $v string, integer (timestamp), or \DateTime value.
+ * Empty strings are treated as NULL.
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setCreatedAt($v)
+ {
+ $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+ if ($this->created_at !== null || $dt !== null) {
+ if ($dt !== $this->created_at) {
+ $this->created_at = $dt;
+ $this->modifiedColumns[] = RewritingUrlTableMap::CREATED_AT;
+ }
+ } // if either are not null
+
+
+ return $this;
+ } // setCreatedAt()
+
+ /**
+ * Sets the value of [updated_at] column to a normalized version of the date/time value specified.
+ *
+ * @param mixed $v string, integer (timestamp), or \DateTime value.
+ * Empty strings are treated as NULL.
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function setUpdatedAt($v)
+ {
+ $dt = PropelDateTime::newInstance($v, null, '\DateTime');
+ if ($this->updated_at !== null || $dt !== null) {
+ if ($dt !== $this->updated_at) {
+ $this->updated_at = $dt;
+ $this->modifiedColumns[] = RewritingUrlTableMap::UPDATED_AT;
+ }
+ } // if either are not null
+
+
+ return $this;
+ } // setUpdatedAt()
+
+ /**
+ * Indicates whether the columns in this object are only set to default values.
+ *
+ * This method can be used in conjunction with isModified() to indicate whether an object is both
+ * modified _and_ has some values set which are non-default.
+ *
+ * @return boolean Whether the columns in this object are only been set with default values.
+ */
+ public function hasOnlyDefaultValues()
+ {
+ // otherwise, everything was equal, so return TRUE
+ return true;
+ } // hasOnlyDefaultValues()
+
+ /**
+ * Hydrates (populates) the object variables with values from the database resultset.
+ *
+ * An offset (0-based "start column") is specified so that objects can be hydrated
+ * with a subset of the columns in the resultset rows. This is needed, for example,
+ * for results of JOIN queries where the resultset row includes columns from two or
+ * more tables.
+ *
+ * @param array $row The row returned by DataFetcher->fetch().
+ * @param int $startcol 0-based offset column which indicates which restultset column to start with.
+ * @param boolean $rehydrate Whether this object is being re-hydrated from the database.
+ * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+ One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ *
+ * @return int next starting column
+ * @throws PropelException - Any caught Exception will be rewrapped as a PropelException.
+ */
+ public function hydrate($row, $startcol = 0, $rehydrate = false, $indexType = TableMap::TYPE_NUM)
+ {
+ try {
+
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 0 + $startcol : RewritingUrlTableMap::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->id = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 1 + $startcol : RewritingUrlTableMap::translateFieldName('Url', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->url = (null !== $col) ? (string) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : RewritingUrlTableMap::translateFieldName('View', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->view = (null !== $col) ? (string) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : RewritingUrlTableMap::translateFieldName('ViewId', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->view_id = (null !== $col) ? (string) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : RewritingUrlTableMap::translateFieldName('ViewLocale', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->view_locale = (null !== $col) ? (string) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : RewritingUrlTableMap::translateFieldName('Redirected', TableMap::TYPE_PHPNAME, $indexType)];
+ $this->redirected = (null !== $col) ? (int) $col : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : RewritingUrlTableMap::translateFieldName('CreatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ if ($col === '0000-00-00 00:00:00') {
+ $col = null;
+ }
+ $this->created_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+
+ $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : RewritingUrlTableMap::translateFieldName('UpdatedAt', TableMap::TYPE_PHPNAME, $indexType)];
+ if ($col === '0000-00-00 00:00:00') {
+ $col = null;
+ }
+ $this->updated_at = (null !== $col) ? PropelDateTime::newInstance($col, null, '\DateTime') : null;
+ $this->resetModified();
+
+ $this->setNew(false);
+
+ if ($rehydrate) {
+ $this->ensureConsistency();
+ }
+
+ return $startcol + 8; // 8 = RewritingUrlTableMap::NUM_HYDRATE_COLUMNS.
+
+ } catch (Exception $e) {
+ throw new PropelException("Error populating \Thelia\Model\RewritingUrl object", 0, $e);
+ }
+ }
+
+ /**
+ * Checks and repairs the internal consistency of the object.
+ *
+ * This method is executed after an already-instantiated object is re-hydrated
+ * from the database. It exists to check any foreign keys to make sure that
+ * the objects related to the current object are correct based on foreign key.
+ *
+ * You can override this method in the stub class, but you should always invoke
+ * the base method from the overridden method (i.e. parent::ensureConsistency()),
+ * in case your model changes.
+ *
+ * @throws PropelException
+ */
+ public function ensureConsistency()
+ {
+ if ($this->aRewritingUrlRelatedByRedirected !== null && $this->redirected !== $this->aRewritingUrlRelatedByRedirected->getId()) {
+ $this->aRewritingUrlRelatedByRedirected = null;
+ }
+ } // ensureConsistency
+
+ /**
+ * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
+ *
+ * This will only work if the object has been saved and has a valid primary key set.
+ *
+ * @param boolean $deep (optional) Whether to also de-associated any related objects.
+ * @param ConnectionInterface $con (optional) The ConnectionInterface connection to use.
+ * @return void
+ * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db
+ */
+ public function reload($deep = false, ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("Cannot reload a deleted object.");
+ }
+
+ if ($this->isNew()) {
+ throw new PropelException("Cannot reload an unsaved object.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getReadConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+
+ // We don't need to alter the object instance pool; we're just modifying this instance
+ // already in the pool.
+
+ $dataFetcher = ChildRewritingUrlQuery::create(null, $this->buildPkeyCriteria())->setFormatter(ModelCriteria::FORMAT_STATEMENT)->find($con);
+ $row = $dataFetcher->fetch();
+ $dataFetcher->close();
+ if (!$row) {
+ throw new PropelException('Cannot find matching row in the database to reload object values.');
+ }
+ $this->hydrate($row, 0, true, $dataFetcher->getIndexType()); // rehydrate
+
+ if ($deep) { // also de-associate any related objects?
+
+ $this->aRewritingUrlRelatedByRedirected = null;
+ $this->collRewritingUrlsRelatedById = null;
+
+ $this->collRewritingArguments = null;
+
+ } // if (deep)
+ }
+
+ /**
+ * Removes this object from datastore and sets delete attribute.
+ *
+ * @param ConnectionInterface $con
+ * @return void
+ * @throws PropelException
+ * @see RewritingUrl::setDeleted()
+ * @see RewritingUrl::isDeleted()
+ */
+ public function delete(ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("This object has already been deleted.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+
+ $con->beginTransaction();
+ try {
+ $deleteQuery = ChildRewritingUrlQuery::create()
+ ->filterByPrimaryKey($this->getPrimaryKey());
+ $ret = $this->preDelete($con);
+ if ($ret) {
+ $deleteQuery->delete($con);
+ $this->postDelete($con);
+ $con->commit();
+ $this->setDeleted(true);
+ } else {
+ $con->commit();
+ }
+ } catch (Exception $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ /**
+ * Persists this object to the database.
+ *
+ * If the object is new, it inserts it; otherwise an update is performed.
+ * All modified related objects will also be persisted in the doSave()
+ * method. This method wraps all precipitate database operations in a
+ * single transaction.
+ *
+ * @param ConnectionInterface $con
+ * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+ * @throws PropelException
+ * @see doSave()
+ */
+ public function save(ConnectionInterface $con = null)
+ {
+ if ($this->isDeleted()) {
+ throw new PropelException("You cannot save an object that has been deleted.");
+ }
+
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+
+ $con->beginTransaction();
+ $isInsert = $this->isNew();
+ try {
+ $ret = $this->preSave($con);
+ if ($isInsert) {
+ $ret = $ret && $this->preInsert($con);
+ // timestampable behavior
+ if (!$this->isColumnModified(RewritingUrlTableMap::CREATED_AT)) {
+ $this->setCreatedAt(time());
+ }
+ if (!$this->isColumnModified(RewritingUrlTableMap::UPDATED_AT)) {
+ $this->setUpdatedAt(time());
+ }
+ } else {
+ $ret = $ret && $this->preUpdate($con);
+ // timestampable behavior
+ if ($this->isModified() && !$this->isColumnModified(RewritingUrlTableMap::UPDATED_AT)) {
+ $this->setUpdatedAt(time());
+ }
+ }
+ if ($ret) {
+ $affectedRows = $this->doSave($con);
+ if ($isInsert) {
+ $this->postInsert($con);
+ } else {
+ $this->postUpdate($con);
+ }
+ $this->postSave($con);
+ RewritingUrlTableMap::addInstanceToPool($this);
+ } else {
+ $affectedRows = 0;
+ }
+ $con->commit();
+
+ return $affectedRows;
+ } catch (Exception $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ /**
+ * Performs the work of inserting or updating the row in the database.
+ *
+ * If the object is new, it inserts it; otherwise an update is performed.
+ * All related objects are also updated in this method.
+ *
+ * @param ConnectionInterface $con
+ * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations.
+ * @throws PropelException
+ * @see save()
+ */
+ protected function doSave(ConnectionInterface $con)
+ {
+ $affectedRows = 0; // initialize var to track total num of affected rows
+ if (!$this->alreadyInSave) {
+ $this->alreadyInSave = true;
+
+ // We call the save method on the following object(s) if they
+ // were passed to this object by their corresponding set
+ // method. This object relates to these object(s) by a
+ // foreign key reference.
+
+ if ($this->aRewritingUrlRelatedByRedirected !== null) {
+ if ($this->aRewritingUrlRelatedByRedirected->isModified() || $this->aRewritingUrlRelatedByRedirected->isNew()) {
+ $affectedRows += $this->aRewritingUrlRelatedByRedirected->save($con);
+ }
+ $this->setRewritingUrlRelatedByRedirected($this->aRewritingUrlRelatedByRedirected);
+ }
+
+ if ($this->isNew() || $this->isModified()) {
+ // persist changes
+ if ($this->isNew()) {
+ $this->doInsert($con);
+ } else {
+ $this->doUpdate($con);
+ }
+ $affectedRows += 1;
+ $this->resetModified();
+ }
+
+ if ($this->rewritingUrlsRelatedByIdScheduledForDeletion !== null) {
+ if (!$this->rewritingUrlsRelatedByIdScheduledForDeletion->isEmpty()) {
+ foreach ($this->rewritingUrlsRelatedByIdScheduledForDeletion as $rewritingUrlRelatedById) {
+ // need to save related object because we set the relation to null
+ $rewritingUrlRelatedById->save($con);
+ }
+ $this->rewritingUrlsRelatedByIdScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collRewritingUrlsRelatedById !== null) {
+ foreach ($this->collRewritingUrlsRelatedById as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
+ if ($this->rewritingArgumentsScheduledForDeletion !== null) {
+ if (!$this->rewritingArgumentsScheduledForDeletion->isEmpty()) {
+ \Thelia\Model\RewritingArgumentQuery::create()
+ ->filterByPrimaryKeys($this->rewritingArgumentsScheduledForDeletion->getPrimaryKeys(false))
+ ->delete($con);
+ $this->rewritingArgumentsScheduledForDeletion = null;
+ }
+ }
+
+ if ($this->collRewritingArguments !== null) {
+ foreach ($this->collRewritingArguments as $referrerFK) {
+ if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+ $affectedRows += $referrerFK->save($con);
+ }
+ }
+ }
+
+ $this->alreadyInSave = false;
+
+ }
+
+ return $affectedRows;
+ } // doSave()
+
+ /**
+ * Insert the row in the database.
+ *
+ * @param ConnectionInterface $con
+ *
+ * @throws PropelException
+ * @see doSave()
+ */
+ protected function doInsert(ConnectionInterface $con)
+ {
+ $modifiedColumns = array();
+ $index = 0;
+
+ $this->modifiedColumns[] = RewritingUrlTableMap::ID;
+ if (null !== $this->id) {
+ throw new PropelException('Cannot insert a value for auto-increment primary key (' . RewritingUrlTableMap::ID . ')');
+ }
+
+ // check the columns in natural order for more readable SQL queries
+ if ($this->isColumnModified(RewritingUrlTableMap::ID)) {
+ $modifiedColumns[':p' . $index++] = 'ID';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::URL)) {
+ $modifiedColumns[':p' . $index++] = 'URL';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW)) {
+ $modifiedColumns[':p' . $index++] = 'VIEW';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW_ID)) {
+ $modifiedColumns[':p' . $index++] = 'VIEW_ID';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW_LOCALE)) {
+ $modifiedColumns[':p' . $index++] = 'VIEW_LOCALE';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::REDIRECTED)) {
+ $modifiedColumns[':p' . $index++] = 'REDIRECTED';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::CREATED_AT)) {
+ $modifiedColumns[':p' . $index++] = 'CREATED_AT';
+ }
+ if ($this->isColumnModified(RewritingUrlTableMap::UPDATED_AT)) {
+ $modifiedColumns[':p' . $index++] = 'UPDATED_AT';
+ }
+
+ $sql = sprintf(
+ 'INSERT INTO rewriting_url (%s) VALUES (%s)',
+ implode(', ', $modifiedColumns),
+ implode(', ', array_keys($modifiedColumns))
+ );
+
+ try {
+ $stmt = $con->prepare($sql);
+ foreach ($modifiedColumns as $identifier => $columnName) {
+ switch ($columnName) {
+ case 'ID':
+ $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT);
+ break;
+ case 'URL':
+ $stmt->bindValue($identifier, $this->url, PDO::PARAM_STR);
+ break;
+ case 'VIEW':
+ $stmt->bindValue($identifier, $this->view, PDO::PARAM_STR);
+ break;
+ case 'VIEW_ID':
+ $stmt->bindValue($identifier, $this->view_id, PDO::PARAM_STR);
+ break;
+ case 'VIEW_LOCALE':
+ $stmt->bindValue($identifier, $this->view_locale, PDO::PARAM_STR);
+ break;
+ case 'REDIRECTED':
+ $stmt->bindValue($identifier, $this->redirected, PDO::PARAM_INT);
+ break;
+ case 'CREATED_AT':
+ $stmt->bindValue($identifier, $this->created_at ? $this->created_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+ break;
+ case 'UPDATED_AT':
+ $stmt->bindValue($identifier, $this->updated_at ? $this->updated_at->format("Y-m-d H:i:s") : null, PDO::PARAM_STR);
+ break;
+ }
+ }
+ $stmt->execute();
+ } catch (Exception $e) {
+ Propel::log($e->getMessage(), Propel::LOG_ERR);
+ throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), 0, $e);
+ }
+
+ try {
+ $pk = $con->lastInsertId();
+ } catch (Exception $e) {
+ throw new PropelException('Unable to get autoincrement id.', 0, $e);
+ }
+ $this->setId($pk);
+
+ $this->setNew(false);
+ }
+
+ /**
+ * Update the row in the database.
+ *
+ * @param ConnectionInterface $con
+ *
+ * @return Integer Number of updated rows
+ * @see doSave()
+ */
+ protected function doUpdate(ConnectionInterface $con)
+ {
+ $selectCriteria = $this->buildPkeyCriteria();
+ $valuesCriteria = $this->buildCriteria();
+
+ return $selectCriteria->doUpdate($valuesCriteria, $con);
+ }
+
+ /**
+ * Retrieves a field from the object by name passed in as a string.
+ *
+ * @param string $name name
+ * @param string $type The type of fieldname the $name is of:
+ * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @return mixed Value of field.
+ */
+ public function getByName($name, $type = TableMap::TYPE_PHPNAME)
+ {
+ $pos = RewritingUrlTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+ $field = $this->getByPosition($pos);
+
+ return $field;
+ }
+
+ /**
+ * Retrieves a field from the object by Position as specified in the xml schema.
+ * Zero-based.
+ *
+ * @param int $pos position in xml schema
+ * @return mixed Value of field at $pos
+ */
+ public function getByPosition($pos)
+ {
+ switch ($pos) {
+ case 0:
+ return $this->getId();
+ break;
+ case 1:
+ return $this->getUrl();
+ break;
+ case 2:
+ return $this->getView();
+ break;
+ case 3:
+ return $this->getViewId();
+ break;
+ case 4:
+ return $this->getViewLocale();
+ break;
+ case 5:
+ return $this->getRedirected();
+ break;
+ case 6:
+ return $this->getCreatedAt();
+ break;
+ case 7:
+ return $this->getUpdatedAt();
+ break;
+ default:
+ return null;
+ break;
+ } // switch()
+ }
+
+ /**
+ * Exports the object as an array.
+ *
+ * You can specify the key type of the array by passing one of the class
+ * type constants.
+ *
+ * @param string $keyType (optional) One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to TRUE.
+ * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion
+ * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE.
+ *
+ * @return array an associative array containing the field names (as keys) and field values
+ */
+ public function toArray($keyType = TableMap::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false)
+ {
+ if (isset($alreadyDumpedObjects['RewritingUrl'][$this->getPrimaryKey()])) {
+ return '*RECURSION*';
+ }
+ $alreadyDumpedObjects['RewritingUrl'][$this->getPrimaryKey()] = true;
+ $keys = RewritingUrlTableMap::getFieldNames($keyType);
+ $result = array(
+ $keys[0] => $this->getId(),
+ $keys[1] => $this->getUrl(),
+ $keys[2] => $this->getView(),
+ $keys[3] => $this->getViewId(),
+ $keys[4] => $this->getViewLocale(),
+ $keys[5] => $this->getRedirected(),
+ $keys[6] => $this->getCreatedAt(),
+ $keys[7] => $this->getUpdatedAt(),
+ );
+ $virtualColumns = $this->virtualColumns;
+ foreach($virtualColumns as $key => $virtualColumn)
+ {
+ $result[$key] = $virtualColumn;
+ }
+
+ if ($includeForeignObjects) {
+ if (null !== $this->aRewritingUrlRelatedByRedirected) {
+ $result['RewritingUrlRelatedByRedirected'] = $this->aRewritingUrlRelatedByRedirected->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true);
+ }
+ if (null !== $this->collRewritingUrlsRelatedById) {
+ $result['RewritingUrlsRelatedById'] = $this->collRewritingUrlsRelatedById->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
+ if (null !== $this->collRewritingArguments) {
+ $result['RewritingArguments'] = $this->collRewritingArguments->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Sets a field from the object by name passed in as a string.
+ *
+ * @param string $name
+ * @param mixed $value field value
+ * @param string $type The type of fieldname the $name is of:
+ * one of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * Defaults to TableMap::TYPE_PHPNAME.
+ * @return void
+ */
+ public function setByName($name, $value, $type = TableMap::TYPE_PHPNAME)
+ {
+ $pos = RewritingUrlTableMap::translateFieldName($name, $type, TableMap::TYPE_NUM);
+
+ return $this->setByPosition($pos, $value);
+ }
+
+ /**
+ * Sets a field from the object by Position as specified in the xml schema.
+ * Zero-based.
+ *
+ * @param int $pos position in xml schema
+ * @param mixed $value field value
+ * @return void
+ */
+ public function setByPosition($pos, $value)
+ {
+ switch ($pos) {
+ case 0:
+ $this->setId($value);
+ break;
+ case 1:
+ $this->setUrl($value);
+ break;
+ case 2:
+ $this->setView($value);
+ break;
+ case 3:
+ $this->setViewId($value);
+ break;
+ case 4:
+ $this->setViewLocale($value);
+ break;
+ case 5:
+ $this->setRedirected($value);
+ break;
+ case 6:
+ $this->setCreatedAt($value);
+ break;
+ case 7:
+ $this->setUpdatedAt($value);
+ break;
+ } // switch()
+ }
+
+ /**
+ * Populates the object using an array.
+ *
+ * This is particularly useful when populating an object from one of the
+ * request arrays (e.g. $_POST). This method goes through the column
+ * names, checking to see whether a matching key exists in populated
+ * array. If so the setByName() method is called for that column.
+ *
+ * You can specify the key type of the array by additionally passing one
+ * of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME,
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ * The default key type is the column's TableMap::TYPE_PHPNAME.
+ *
+ * @param array $arr An array to populate the object from.
+ * @param string $keyType The type of keys the array uses.
+ * @return void
+ */
+ public function fromArray($arr, $keyType = TableMap::TYPE_PHPNAME)
+ {
+ $keys = RewritingUrlTableMap::getFieldNames($keyType);
+
+ if (array_key_exists($keys[0], $arr)) $this->setId($arr[$keys[0]]);
+ if (array_key_exists($keys[1], $arr)) $this->setUrl($arr[$keys[1]]);
+ if (array_key_exists($keys[2], $arr)) $this->setView($arr[$keys[2]]);
+ if (array_key_exists($keys[3], $arr)) $this->setViewId($arr[$keys[3]]);
+ if (array_key_exists($keys[4], $arr)) $this->setViewLocale($arr[$keys[4]]);
+ if (array_key_exists($keys[5], $arr)) $this->setRedirected($arr[$keys[5]]);
+ if (array_key_exists($keys[6], $arr)) $this->setCreatedAt($arr[$keys[6]]);
+ if (array_key_exists($keys[7], $arr)) $this->setUpdatedAt($arr[$keys[7]]);
+ }
+
+ /**
+ * Build a Criteria object containing the values of all modified columns in this object.
+ *
+ * @return Criteria The Criteria object containing all modified values.
+ */
+ public function buildCriteria()
+ {
+ $criteria = new Criteria(RewritingUrlTableMap::DATABASE_NAME);
+
+ if ($this->isColumnModified(RewritingUrlTableMap::ID)) $criteria->add(RewritingUrlTableMap::ID, $this->id);
+ if ($this->isColumnModified(RewritingUrlTableMap::URL)) $criteria->add(RewritingUrlTableMap::URL, $this->url);
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW)) $criteria->add(RewritingUrlTableMap::VIEW, $this->view);
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW_ID)) $criteria->add(RewritingUrlTableMap::VIEW_ID, $this->view_id);
+ if ($this->isColumnModified(RewritingUrlTableMap::VIEW_LOCALE)) $criteria->add(RewritingUrlTableMap::VIEW_LOCALE, $this->view_locale);
+ if ($this->isColumnModified(RewritingUrlTableMap::REDIRECTED)) $criteria->add(RewritingUrlTableMap::REDIRECTED, $this->redirected);
+ if ($this->isColumnModified(RewritingUrlTableMap::CREATED_AT)) $criteria->add(RewritingUrlTableMap::CREATED_AT, $this->created_at);
+ if ($this->isColumnModified(RewritingUrlTableMap::UPDATED_AT)) $criteria->add(RewritingUrlTableMap::UPDATED_AT, $this->updated_at);
+
+ return $criteria;
+ }
+
+ /**
+ * Builds a Criteria object containing the primary key for this object.
+ *
+ * Unlike buildCriteria() this method includes the primary key values regardless
+ * of whether or not they have been modified.
+ *
+ * @return Criteria The Criteria object containing value(s) for primary key(s).
+ */
+ public function buildPkeyCriteria()
+ {
+ $criteria = new Criteria(RewritingUrlTableMap::DATABASE_NAME);
+ $criteria->add(RewritingUrlTableMap::ID, $this->id);
+
+ return $criteria;
+ }
+
+ /**
+ * Returns the primary key for this object (row).
+ * @return int
+ */
+ public function getPrimaryKey()
+ {
+ return $this->getId();
+ }
+
+ /**
+ * Generic method to set the primary key (id column).
+ *
+ * @param int $key Primary key.
+ * @return void
+ */
+ public function setPrimaryKey($key)
+ {
+ $this->setId($key);
+ }
+
+ /**
+ * Returns true if the primary key for this object is null.
+ * @return boolean
+ */
+ public function isPrimaryKeyNull()
+ {
+
+ return null === $this->getId();
+ }
+
+ /**
+ * Sets contents of passed object to values from current object.
+ *
+ * If desired, this method can also make copies of all associated (fkey referrers)
+ * objects.
+ *
+ * @param object $copyObj An object of \Thelia\Model\RewritingUrl (or compatible) type.
+ * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+ * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new.
+ * @throws PropelException
+ */
+ public function copyInto($copyObj, $deepCopy = false, $makeNew = true)
+ {
+ $copyObj->setUrl($this->getUrl());
+ $copyObj->setView($this->getView());
+ $copyObj->setViewId($this->getViewId());
+ $copyObj->setViewLocale($this->getViewLocale());
+ $copyObj->setRedirected($this->getRedirected());
+ $copyObj->setCreatedAt($this->getCreatedAt());
+ $copyObj->setUpdatedAt($this->getUpdatedAt());
+
+ if ($deepCopy) {
+ // important: temporarily setNew(false) because this affects the behavior of
+ // the getter/setter methods for fkey referrer objects.
+ $copyObj->setNew(false);
+
+ foreach ($this->getRewritingUrlsRelatedById() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addRewritingUrlRelatedById($relObj->copy($deepCopy));
+ }
+ }
+
+ foreach ($this->getRewritingArguments() as $relObj) {
+ if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
+ $copyObj->addRewritingArgument($relObj->copy($deepCopy));
+ }
+ }
+
+ } // if ($deepCopy)
+
+ if ($makeNew) {
+ $copyObj->setNew(true);
+ $copyObj->setId(NULL); // this is a auto-increment column, so set to default value
+ }
+ }
+
+ /**
+ * Makes a copy of this object that will be inserted as a new row in table when saved.
+ * It creates a new object filling in the simple attributes, but skipping any primary
+ * keys that are defined for the table.
+ *
+ * If desired, this method can also make copies of all associated (fkey referrers)
+ * objects.
+ *
+ * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
+ * @return \Thelia\Model\RewritingUrl Clone of current object.
+ * @throws PropelException
+ */
+ public function copy($deepCopy = false)
+ {
+ // we use get_class(), because this might be a subclass
+ $clazz = get_class($this);
+ $copyObj = new $clazz();
+ $this->copyInto($copyObj, $deepCopy);
+
+ return $copyObj;
+ }
+
+ /**
+ * Declares an association between this object and a ChildRewritingUrl object.
+ *
+ * @param ChildRewritingUrl $v
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ * @throws PropelException
+ */
+ public function setRewritingUrlRelatedByRedirected(ChildRewritingUrl $v = null)
+ {
+ if ($v === null) {
+ $this->setRedirected(NULL);
+ } else {
+ $this->setRedirected($v->getId());
+ }
+
+ $this->aRewritingUrlRelatedByRedirected = $v;
+
+ // Add binding for other direction of this n:n relationship.
+ // If this object has already been added to the ChildRewritingUrl object, it will not be re-added.
+ if ($v !== null) {
+ $v->addRewritingUrlRelatedById($this);
+ }
+
+
+ return $this;
+ }
+
+
+ /**
+ * Get the associated ChildRewritingUrl object
+ *
+ * @param ConnectionInterface $con Optional Connection object.
+ * @return ChildRewritingUrl The associated ChildRewritingUrl object.
+ * @throws PropelException
+ */
+ public function getRewritingUrlRelatedByRedirected(ConnectionInterface $con = null)
+ {
+ if ($this->aRewritingUrlRelatedByRedirected === null && ($this->redirected !== null)) {
+ $this->aRewritingUrlRelatedByRedirected = ChildRewritingUrlQuery::create()->findPk($this->redirected, $con);
+ /* The following can be used additionally to
+ guarantee the related object contains a reference
+ to this object. This level of coupling may, however, be
+ undesirable since it could result in an only partially populated collection
+ in the referenced object.
+ $this->aRewritingUrlRelatedByRedirected->addRewritingUrlsRelatedById($this);
+ */
+ }
+
+ return $this->aRewritingUrlRelatedByRedirected;
+ }
+
+
+ /**
+ * Initializes a collection based on the name of a relation.
+ * Avoids crafting an 'init[$relationName]s' method name
+ * that wouldn't work when StandardEnglishPluralizer is used.
+ *
+ * @param string $relationName The name of the relation to initialize
+ * @return void
+ */
+ public function initRelation($relationName)
+ {
+ if ('RewritingUrlRelatedById' == $relationName) {
+ return $this->initRewritingUrlsRelatedById();
+ }
+ if ('RewritingArgument' == $relationName) {
+ return $this->initRewritingArguments();
+ }
+ }
+
+ /**
+ * Clears out the collRewritingUrlsRelatedById collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addRewritingUrlsRelatedById()
+ */
+ public function clearRewritingUrlsRelatedById()
+ {
+ $this->collRewritingUrlsRelatedById = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collRewritingUrlsRelatedById collection loaded partially.
+ */
+ public function resetPartialRewritingUrlsRelatedById($v = true)
+ {
+ $this->collRewritingUrlsRelatedByIdPartial = $v;
+ }
+
+ /**
+ * Initializes the collRewritingUrlsRelatedById collection.
+ *
+ * By default this just sets the collRewritingUrlsRelatedById collection to an empty array (like clearcollRewritingUrlsRelatedById());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initRewritingUrlsRelatedById($overrideExisting = true)
+ {
+ if (null !== $this->collRewritingUrlsRelatedById && !$overrideExisting) {
+ return;
+ }
+ $this->collRewritingUrlsRelatedById = new ObjectCollection();
+ $this->collRewritingUrlsRelatedById->setModel('\Thelia\Model\RewritingUrl');
+ }
+
+ /**
+ * Gets an array of ChildRewritingUrl objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildRewritingUrl is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildRewritingUrl[] List of ChildRewritingUrl objects
+ * @throws PropelException
+ */
+ public function getRewritingUrlsRelatedById($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collRewritingUrlsRelatedByIdPartial && !$this->isNew();
+ if (null === $this->collRewritingUrlsRelatedById || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collRewritingUrlsRelatedById) {
+ // return empty collection
+ $this->initRewritingUrlsRelatedById();
+ } else {
+ $collRewritingUrlsRelatedById = ChildRewritingUrlQuery::create(null, $criteria)
+ ->filterByRewritingUrlRelatedByRedirected($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collRewritingUrlsRelatedByIdPartial && count($collRewritingUrlsRelatedById)) {
+ $this->initRewritingUrlsRelatedById(false);
+
+ foreach ($collRewritingUrlsRelatedById as $obj) {
+ if (false == $this->collRewritingUrlsRelatedById->contains($obj)) {
+ $this->collRewritingUrlsRelatedById->append($obj);
+ }
+ }
+
+ $this->collRewritingUrlsRelatedByIdPartial = true;
+ }
+
+ $collRewritingUrlsRelatedById->getInternalIterator()->rewind();
+
+ return $collRewritingUrlsRelatedById;
+ }
+
+ if ($partial && $this->collRewritingUrlsRelatedById) {
+ foreach ($this->collRewritingUrlsRelatedById as $obj) {
+ if ($obj->isNew()) {
+ $collRewritingUrlsRelatedById[] = $obj;
+ }
+ }
+ }
+
+ $this->collRewritingUrlsRelatedById = $collRewritingUrlsRelatedById;
+ $this->collRewritingUrlsRelatedByIdPartial = false;
+ }
+ }
+
+ return $this->collRewritingUrlsRelatedById;
+ }
+
+ /**
+ * Sets a collection of RewritingUrlRelatedById objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $rewritingUrlsRelatedById A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildRewritingUrl The current object (for fluent API support)
+ */
+ public function setRewritingUrlsRelatedById(Collection $rewritingUrlsRelatedById, ConnectionInterface $con = null)
+ {
+ $rewritingUrlsRelatedByIdToDelete = $this->getRewritingUrlsRelatedById(new Criteria(), $con)->diff($rewritingUrlsRelatedById);
+
+
+ $this->rewritingUrlsRelatedByIdScheduledForDeletion = $rewritingUrlsRelatedByIdToDelete;
+
+ foreach ($rewritingUrlsRelatedByIdToDelete as $rewritingUrlRelatedByIdRemoved) {
+ $rewritingUrlRelatedByIdRemoved->setRewritingUrlRelatedByRedirected(null);
+ }
+
+ $this->collRewritingUrlsRelatedById = null;
+ foreach ($rewritingUrlsRelatedById as $rewritingUrlRelatedById) {
+ $this->addRewritingUrlRelatedById($rewritingUrlRelatedById);
+ }
+
+ $this->collRewritingUrlsRelatedById = $rewritingUrlsRelatedById;
+ $this->collRewritingUrlsRelatedByIdPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related RewritingUrl objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related RewritingUrl objects.
+ * @throws PropelException
+ */
+ public function countRewritingUrlsRelatedById(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collRewritingUrlsRelatedByIdPartial && !$this->isNew();
+ if (null === $this->collRewritingUrlsRelatedById || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collRewritingUrlsRelatedById) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getRewritingUrlsRelatedById());
+ }
+
+ $query = ChildRewritingUrlQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByRewritingUrlRelatedByRedirected($this)
+ ->count($con);
+ }
+
+ return count($this->collRewritingUrlsRelatedById);
+ }
+
+ /**
+ * Method called to associate a ChildRewritingUrl object to this object
+ * through the ChildRewritingUrl foreign key attribute.
+ *
+ * @param ChildRewritingUrl $l ChildRewritingUrl
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function addRewritingUrlRelatedById(ChildRewritingUrl $l)
+ {
+ if ($this->collRewritingUrlsRelatedById === null) {
+ $this->initRewritingUrlsRelatedById();
+ $this->collRewritingUrlsRelatedByIdPartial = true;
+ }
+
+ if (!in_array($l, $this->collRewritingUrlsRelatedById->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddRewritingUrlRelatedById($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param RewritingUrlRelatedById $rewritingUrlRelatedById The rewritingUrlRelatedById object to add.
+ */
+ protected function doAddRewritingUrlRelatedById($rewritingUrlRelatedById)
+ {
+ $this->collRewritingUrlsRelatedById[]= $rewritingUrlRelatedById;
+ $rewritingUrlRelatedById->setRewritingUrlRelatedByRedirected($this);
+ }
+
+ /**
+ * @param RewritingUrlRelatedById $rewritingUrlRelatedById The rewritingUrlRelatedById object to remove.
+ * @return ChildRewritingUrl The current object (for fluent API support)
+ */
+ public function removeRewritingUrlRelatedById($rewritingUrlRelatedById)
+ {
+ if ($this->getRewritingUrlsRelatedById()->contains($rewritingUrlRelatedById)) {
+ $this->collRewritingUrlsRelatedById->remove($this->collRewritingUrlsRelatedById->search($rewritingUrlRelatedById));
+ if (null === $this->rewritingUrlsRelatedByIdScheduledForDeletion) {
+ $this->rewritingUrlsRelatedByIdScheduledForDeletion = clone $this->collRewritingUrlsRelatedById;
+ $this->rewritingUrlsRelatedByIdScheduledForDeletion->clear();
+ }
+ $this->rewritingUrlsRelatedByIdScheduledForDeletion[]= $rewritingUrlRelatedById;
+ $rewritingUrlRelatedById->setRewritingUrlRelatedByRedirected(null);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Clears out the collRewritingArguments collection
+ *
+ * This does not modify the database; however, it will remove any associated objects, causing
+ * them to be refetched by subsequent calls to accessor method.
+ *
+ * @return void
+ * @see addRewritingArguments()
+ */
+ public function clearRewritingArguments()
+ {
+ $this->collRewritingArguments = null; // important to set this to NULL since that means it is uninitialized
+ }
+
+ /**
+ * Reset is the collRewritingArguments collection loaded partially.
+ */
+ public function resetPartialRewritingArguments($v = true)
+ {
+ $this->collRewritingArgumentsPartial = $v;
+ }
+
+ /**
+ * Initializes the collRewritingArguments collection.
+ *
+ * By default this just sets the collRewritingArguments collection to an empty array (like clearcollRewritingArguments());
+ * however, you may wish to override this method in your stub class to provide setting appropriate
+ * to your application -- for example, setting the initial array to the values stored in database.
+ *
+ * @param boolean $overrideExisting If set to true, the method call initializes
+ * the collection even if it is not empty
+ *
+ * @return void
+ */
+ public function initRewritingArguments($overrideExisting = true)
+ {
+ if (null !== $this->collRewritingArguments && !$overrideExisting) {
+ return;
+ }
+ $this->collRewritingArguments = new ObjectCollection();
+ $this->collRewritingArguments->setModel('\Thelia\Model\RewritingArgument');
+ }
+
+ /**
+ * Gets an array of ChildRewritingArgument objects which contain a foreign key that references this object.
+ *
+ * If the $criteria is not null, it is used to always fetch the results from the database.
+ * Otherwise the results are fetched from the database the first time, then cached.
+ * Next time the same method is called without $criteria, the cached collection is returned.
+ * If this ChildRewritingUrl is new, it will return
+ * an empty collection or the current collection; the criteria is ignored on a new object.
+ *
+ * @param Criteria $criteria optional Criteria object to narrow the query
+ * @param ConnectionInterface $con optional connection object
+ * @return Collection|ChildRewritingArgument[] List of ChildRewritingArgument objects
+ * @throws PropelException
+ */
+ public function getRewritingArguments($criteria = null, ConnectionInterface $con = null)
+ {
+ $partial = $this->collRewritingArgumentsPartial && !$this->isNew();
+ if (null === $this->collRewritingArguments || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collRewritingArguments) {
+ // return empty collection
+ $this->initRewritingArguments();
+ } else {
+ $collRewritingArguments = ChildRewritingArgumentQuery::create(null, $criteria)
+ ->filterByRewritingUrl($this)
+ ->find($con);
+
+ if (null !== $criteria) {
+ if (false !== $this->collRewritingArgumentsPartial && count($collRewritingArguments)) {
+ $this->initRewritingArguments(false);
+
+ foreach ($collRewritingArguments as $obj) {
+ if (false == $this->collRewritingArguments->contains($obj)) {
+ $this->collRewritingArguments->append($obj);
+ }
+ }
+
+ $this->collRewritingArgumentsPartial = true;
+ }
+
+ $collRewritingArguments->getInternalIterator()->rewind();
+
+ return $collRewritingArguments;
+ }
+
+ if ($partial && $this->collRewritingArguments) {
+ foreach ($this->collRewritingArguments as $obj) {
+ if ($obj->isNew()) {
+ $collRewritingArguments[] = $obj;
+ }
+ }
+ }
+
+ $this->collRewritingArguments = $collRewritingArguments;
+ $this->collRewritingArgumentsPartial = false;
+ }
+ }
+
+ return $this->collRewritingArguments;
+ }
+
+ /**
+ * Sets a collection of RewritingArgument objects related by a one-to-many relationship
+ * to the current object.
+ * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+ * and new objects from the given Propel collection.
+ *
+ * @param Collection $rewritingArguments A Propel collection.
+ * @param ConnectionInterface $con Optional connection object
+ * @return ChildRewritingUrl The current object (for fluent API support)
+ */
+ public function setRewritingArguments(Collection $rewritingArguments, ConnectionInterface $con = null)
+ {
+ $rewritingArgumentsToDelete = $this->getRewritingArguments(new Criteria(), $con)->diff($rewritingArguments);
+
+
+ //since at least one column in the foreign key is at the same time a PK
+ //we can not just set a PK to NULL in the lines below. We have to store
+ //a backup of all values, so we are able to manipulate these items based on the onDelete value later.
+ $this->rewritingArgumentsScheduledForDeletion = clone $rewritingArgumentsToDelete;
+
+ foreach ($rewritingArgumentsToDelete as $rewritingArgumentRemoved) {
+ $rewritingArgumentRemoved->setRewritingUrl(null);
+ }
+
+ $this->collRewritingArguments = null;
+ foreach ($rewritingArguments as $rewritingArgument) {
+ $this->addRewritingArgument($rewritingArgument);
+ }
+
+ $this->collRewritingArguments = $rewritingArguments;
+ $this->collRewritingArgumentsPartial = false;
+
+ return $this;
+ }
+
+ /**
+ * Returns the number of related RewritingArgument objects.
+ *
+ * @param Criteria $criteria
+ * @param boolean $distinct
+ * @param ConnectionInterface $con
+ * @return int Count of related RewritingArgument objects.
+ * @throws PropelException
+ */
+ public function countRewritingArguments(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+ {
+ $partial = $this->collRewritingArgumentsPartial && !$this->isNew();
+ if (null === $this->collRewritingArguments || null !== $criteria || $partial) {
+ if ($this->isNew() && null === $this->collRewritingArguments) {
+ return 0;
+ }
+
+ if ($partial && !$criteria) {
+ return count($this->getRewritingArguments());
+ }
+
+ $query = ChildRewritingArgumentQuery::create(null, $criteria);
+ if ($distinct) {
+ $query->distinct();
+ }
+
+ return $query
+ ->filterByRewritingUrl($this)
+ ->count($con);
+ }
+
+ return count($this->collRewritingArguments);
+ }
+
+ /**
+ * Method called to associate a ChildRewritingArgument object to this object
+ * through the ChildRewritingArgument foreign key attribute.
+ *
+ * @param ChildRewritingArgument $l ChildRewritingArgument
+ * @return \Thelia\Model\RewritingUrl The current object (for fluent API support)
+ */
+ public function addRewritingArgument(ChildRewritingArgument $l)
+ {
+ if ($this->collRewritingArguments === null) {
+ $this->initRewritingArguments();
+ $this->collRewritingArgumentsPartial = true;
+ }
+
+ if (!in_array($l, $this->collRewritingArguments->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
+ $this->doAddRewritingArgument($l);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param RewritingArgument $rewritingArgument The rewritingArgument object to add.
+ */
+ protected function doAddRewritingArgument($rewritingArgument)
+ {
+ $this->collRewritingArguments[]= $rewritingArgument;
+ $rewritingArgument->setRewritingUrl($this);
+ }
+
+ /**
+ * @param RewritingArgument $rewritingArgument The rewritingArgument object to remove.
+ * @return ChildRewritingUrl The current object (for fluent API support)
+ */
+ public function removeRewritingArgument($rewritingArgument)
+ {
+ if ($this->getRewritingArguments()->contains($rewritingArgument)) {
+ $this->collRewritingArguments->remove($this->collRewritingArguments->search($rewritingArgument));
+ if (null === $this->rewritingArgumentsScheduledForDeletion) {
+ $this->rewritingArgumentsScheduledForDeletion = clone $this->collRewritingArguments;
+ $this->rewritingArgumentsScheduledForDeletion->clear();
+ }
+ $this->rewritingArgumentsScheduledForDeletion[]= clone $rewritingArgument;
+ $rewritingArgument->setRewritingUrl(null);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Clears the current object and sets all attributes to their default values
+ */
+ public function clear()
+ {
+ $this->id = null;
+ $this->url = null;
+ $this->view = null;
+ $this->view_id = null;
+ $this->view_locale = null;
+ $this->redirected = null;
+ $this->created_at = null;
+ $this->updated_at = null;
+ $this->alreadyInSave = false;
+ $this->clearAllReferences();
+ $this->resetModified();
+ $this->setNew(true);
+ $this->setDeleted(false);
+ }
+
+ /**
+ * Resets all references to other model objects or collections of model objects.
+ *
+ * This method is a user-space workaround for PHP's inability to garbage collect
+ * objects with circular references (even in PHP 5.3). This is currently necessary
+ * when using Propel in certain daemon or large-volume/high-memory operations.
+ *
+ * @param boolean $deep Whether to also clear the references on all referrer objects.
+ */
+ public function clearAllReferences($deep = false)
+ {
+ if ($deep) {
+ if ($this->collRewritingUrlsRelatedById) {
+ foreach ($this->collRewritingUrlsRelatedById as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
+ if ($this->collRewritingArguments) {
+ foreach ($this->collRewritingArguments as $o) {
+ $o->clearAllReferences($deep);
+ }
+ }
+ } // if ($deep)
+
+ if ($this->collRewritingUrlsRelatedById instanceof Collection) {
+ $this->collRewritingUrlsRelatedById->clearIterator();
+ }
+ $this->collRewritingUrlsRelatedById = null;
+ if ($this->collRewritingArguments instanceof Collection) {
+ $this->collRewritingArguments->clearIterator();
+ }
+ $this->collRewritingArguments = null;
+ $this->aRewritingUrlRelatedByRedirected = null;
+ }
+
+ /**
+ * Return the string representation of this object
+ *
+ * @return string
+ */
+ public function __toString()
+ {
+ return (string) $this->exportTo(RewritingUrlTableMap::DEFAULT_STRING_FORMAT);
+ }
+
+ // timestampable behavior
+
+ /**
+ * Mark the current object so that the update date doesn't get updated during next save
+ *
+ * @return ChildRewritingUrl The current object (for fluent API support)
+ */
+ public function keepUpdateDateUnchanged()
+ {
+ $this->modifiedColumns[] = RewritingUrlTableMap::UPDATED_AT;
+
+ return $this;
+ }
+
+ /**
+ * Code to be run before persisting the object
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preSave(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after persisting the object
+ * @param ConnectionInterface $con
+ */
+ public function postSave(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before inserting to database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preInsert(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after inserting to database
+ * @param ConnectionInterface $con
+ */
+ public function postInsert(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before updating the object in database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preUpdate(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after updating the object in database
+ * @param ConnectionInterface $con
+ */
+ public function postUpdate(ConnectionInterface $con = null)
+ {
+
+ }
+
+ /**
+ * Code to be run before deleting the object in database
+ * @param ConnectionInterface $con
+ * @return boolean
+ */
+ public function preDelete(ConnectionInterface $con = null)
+ {
+ return true;
+ }
+
+ /**
+ * Code to be run after deleting the object in database
+ * @param ConnectionInterface $con
+ */
+ public function postDelete(ConnectionInterface $con = null)
+ {
+
+ }
+
+
+ /**
+ * Derived method to catches calls to undefined methods.
+ *
+ * Provides magic import/export method support (fromXML()/toXML(), fromYAML()/toYAML(), etc.).
+ * Allows to define default __call() behavior if you overwrite __call()
+ *
+ * @param string $name
+ * @param mixed $params
+ *
+ * @return array|string
+ */
+ public function __call($name, $params)
+ {
+ if (0 === strpos($name, 'get')) {
+ $virtualColumn = substr($name, 3);
+ if ($this->hasVirtualColumn($virtualColumn)) {
+ return $this->getVirtualColumn($virtualColumn);
+ }
+
+ $virtualColumn = lcfirst($virtualColumn);
+ if ($this->hasVirtualColumn($virtualColumn)) {
+ return $this->getVirtualColumn($virtualColumn);
+ }
+ }
+
+ if (0 === strpos($name, 'from')) {
+ $format = substr($name, 4);
+
+ return $this->importFrom($format, reset($params));
+ }
+
+ if (0 === strpos($name, 'to')) {
+ $format = substr($name, 2);
+ $includeLazyLoadColumns = isset($params[0]) ? $params[0] : true;
+
+ return $this->exportTo($format, $includeLazyLoadColumns);
+ }
+
+ throw new BadMethodCallException(sprintf('Call to undefined method: %s.', $name));
+ }
+
+}
diff --git a/core/lib/Thelia/Model/Base/RewritingUrlQuery.php b/core/lib/Thelia/Model/Base/RewritingUrlQuery.php
new file mode 100644
index 000000000..c3c73b923
--- /dev/null
+++ b/core/lib/Thelia/Model/Base/RewritingUrlQuery.php
@@ -0,0 +1,919 @@
+setModelAlias($modelAlias);
+ }
+ if ($criteria instanceof Criteria) {
+ $query->mergeWith($criteria);
+ }
+
+ return $query;
+ }
+
+ /**
+ * Find object by primary key.
+ * Propel uses the instance pool to skip the database if the object exists.
+ * Go fast if the query is untouched.
+ *
+ *
+ * $obj = $c->findPk(12, $con);
+ *
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ChildRewritingUrl|array|mixed the result, formatted by the current formatter
+ */
+ public function findPk($key, $con = null)
+ {
+ if ($key === null) {
+ return null;
+ }
+ if ((null !== ($obj = RewritingUrlTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+ // the object is already in the instance pool
+ return $obj;
+ }
+ if ($con === null) {
+ $con = Propel::getServiceContainer()->getReadConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+ $this->basePreSelect($con);
+ if ($this->formatter || $this->modelAlias || $this->with || $this->select
+ || $this->selectColumns || $this->asColumns || $this->selectModifiers
+ || $this->map || $this->having || $this->joins) {
+ return $this->findPkComplex($key, $con);
+ } else {
+ return $this->findPkSimple($key, $con);
+ }
+ }
+
+ /**
+ * Find object by primary key using raw SQL to go fast.
+ * Bypass doSelect() and the object formatter by using generated code.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildRewritingUrl A model object, or null if the key is not found
+ */
+ protected function findPkSimple($key, $con)
+ {
+ $sql = 'SELECT ID, URL, VIEW, VIEW_ID, VIEW_LOCALE, REDIRECTED, CREATED_AT, UPDATED_AT FROM rewriting_url WHERE ID = :p0';
+ try {
+ $stmt = $con->prepare($sql);
+ $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+ $stmt->execute();
+ } catch (Exception $e) {
+ Propel::log($e->getMessage(), Propel::LOG_ERR);
+ throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+ }
+ $obj = null;
+ if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+ $obj = new ChildRewritingUrl();
+ $obj->hydrate($row);
+ RewritingUrlTableMap::addInstanceToPool($obj, (string) $key);
+ }
+ $stmt->closeCursor();
+
+ return $obj;
+ }
+
+ /**
+ * Find object by primary key.
+ *
+ * @param mixed $key Primary key to use for the query
+ * @param ConnectionInterface $con A connection object
+ *
+ * @return ChildRewritingUrl|array|mixed the result, formatted by the current formatter
+ */
+ protected function findPkComplex($key, $con)
+ {
+ // As the query uses a PK condition, no limit(1) is necessary.
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKey($key)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+ }
+
+ /**
+ * Find objects by primary key
+ *
+ * $objs = $c->findPks(array(12, 56, 832), $con);
+ *
+ * @param array $keys Primary keys to use for the query
+ * @param ConnectionInterface $con an optional connection object
+ *
+ * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+ */
+ public function findPks($keys, $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+ }
+ $this->basePreSelect($con);
+ $criteria = $this->isKeepQuery() ? clone $this : $this;
+ $dataFetcher = $criteria
+ ->filterByPrimaryKeys($keys)
+ ->doSelect($con);
+
+ return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+ }
+
+ /**
+ * Filter the query by primary key
+ *
+ * @param mixed $key Primary key to use for the query
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKey($key)
+ {
+
+ return $this->addUsingAlias(RewritingUrlTableMap::ID, $key, Criteria::EQUAL);
+ }
+
+ /**
+ * Filter the query by a list of primary keys
+ *
+ * @param array $keys The list of primary key to use for the query
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByPrimaryKeys($keys)
+ {
+
+ return $this->addUsingAlias(RewritingUrlTableMap::ID, $keys, Criteria::IN);
+ }
+
+ /**
+ * Filter the query on the id column
+ *
+ * Example usage:
+ *
+ * $query->filterById(1234); // WHERE id = 1234
+ * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+ * $query->filterById(array('min' => 12)); // WHERE id > 12
+ *
+ *
+ * @param mixed $id The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterById($id = null, $comparison = null)
+ {
+ if (is_array($id)) {
+ $useMinMax = false;
+ if (isset($id['min'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::ID, $id['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($id['max'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::ID, $id['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::ID, $id, $comparison);
+ }
+
+ /**
+ * Filter the query on the url column
+ *
+ * Example usage:
+ *
+ * $query->filterByUrl('fooValue'); // WHERE url = 'fooValue'
+ * $query->filterByUrl('%fooValue%'); // WHERE url LIKE '%fooValue%'
+ *
+ *
+ * @param string $url The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByUrl($url = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($url)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $url)) {
+ $url = str_replace('*', '%', $url);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::URL, $url, $comparison);
+ }
+
+ /**
+ * Filter the query on the view column
+ *
+ * Example usage:
+ *
+ * $query->filterByView('fooValue'); // WHERE view = 'fooValue'
+ * $query->filterByView('%fooValue%'); // WHERE view LIKE '%fooValue%'
+ *
+ *
+ * @param string $view The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByView($view = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($view)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $view)) {
+ $view = str_replace('*', '%', $view);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::VIEW, $view, $comparison);
+ }
+
+ /**
+ * Filter the query on the view_id column
+ *
+ * Example usage:
+ *
+ * $query->filterByViewId('fooValue'); // WHERE view_id = 'fooValue'
+ * $query->filterByViewId('%fooValue%'); // WHERE view_id LIKE '%fooValue%'
+ *
+ *
+ * @param string $viewId The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByViewId($viewId = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($viewId)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $viewId)) {
+ $viewId = str_replace('*', '%', $viewId);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::VIEW_ID, $viewId, $comparison);
+ }
+
+ /**
+ * Filter the query on the view_locale column
+ *
+ * Example usage:
+ *
+ * $query->filterByViewLocale('fooValue'); // WHERE view_locale = 'fooValue'
+ * $query->filterByViewLocale('%fooValue%'); // WHERE view_locale LIKE '%fooValue%'
+ *
+ *
+ * @param string $viewLocale The value to use as filter.
+ * Accepts wildcards (* and % trigger a LIKE)
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByViewLocale($viewLocale = null, $comparison = null)
+ {
+ if (null === $comparison) {
+ if (is_array($viewLocale)) {
+ $comparison = Criteria::IN;
+ } elseif (preg_match('/[\%\*]/', $viewLocale)) {
+ $viewLocale = str_replace('*', '%', $viewLocale);
+ $comparison = Criteria::LIKE;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::VIEW_LOCALE, $viewLocale, $comparison);
+ }
+
+ /**
+ * Filter the query on the redirected column
+ *
+ * Example usage:
+ *
+ * $query->filterByRedirected(1234); // WHERE redirected = 1234
+ * $query->filterByRedirected(array(12, 34)); // WHERE redirected IN (12, 34)
+ * $query->filterByRedirected(array('min' => 12)); // WHERE redirected > 12
+ *
+ *
+ * @see filterByRewritingUrlRelatedByRedirected()
+ *
+ * @param mixed $redirected The value to use as filter.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByRedirected($redirected = null, $comparison = null)
+ {
+ if (is_array($redirected)) {
+ $useMinMax = false;
+ if (isset($redirected['min'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::REDIRECTED, $redirected['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($redirected['max'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::REDIRECTED, $redirected['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::REDIRECTED, $redirected, $comparison);
+ }
+
+ /**
+ * Filter the query on the created_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByCreatedAt('2011-03-14'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt('now'); // WHERE created_at = '2011-03-14'
+ * $query->filterByCreatedAt(array('max' => 'yesterday')); // WHERE created_at > '2011-03-13'
+ *
+ *
+ * @param mixed $createdAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByCreatedAt($createdAt = null, $comparison = null)
+ {
+ if (is_array($createdAt)) {
+ $useMinMax = false;
+ if (isset($createdAt['min'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::CREATED_AT, $createdAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($createdAt['max'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::CREATED_AT, $createdAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::CREATED_AT, $createdAt, $comparison);
+ }
+
+ /**
+ * Filter the query on the updated_at column
+ *
+ * Example usage:
+ *
+ * $query->filterByUpdatedAt('2011-03-14'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt('now'); // WHERE updated_at = '2011-03-14'
+ * $query->filterByUpdatedAt(array('max' => 'yesterday')); // WHERE updated_at > '2011-03-13'
+ *
+ *
+ * @param mixed $updatedAt The value to use as filter.
+ * Values can be integers (unix timestamps), DateTime objects, or strings.
+ * Empty strings are treated as NULL.
+ * Use scalar values for equality.
+ * Use array values for in_array() equivalent.
+ * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByUpdatedAt($updatedAt = null, $comparison = null)
+ {
+ if (is_array($updatedAt)) {
+ $useMinMax = false;
+ if (isset($updatedAt['min'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::UPDATED_AT, $updatedAt['min'], Criteria::GREATER_EQUAL);
+ $useMinMax = true;
+ }
+ if (isset($updatedAt['max'])) {
+ $this->addUsingAlias(RewritingUrlTableMap::UPDATED_AT, $updatedAt['max'], Criteria::LESS_EQUAL);
+ $useMinMax = true;
+ }
+ if ($useMinMax) {
+ return $this;
+ }
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+ }
+
+ return $this->addUsingAlias(RewritingUrlTableMap::UPDATED_AT, $updatedAt, $comparison);
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\RewritingUrl object
+ *
+ * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl The related object(s) to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByRewritingUrlRelatedByRedirected($rewritingUrl, $comparison = null)
+ {
+ if ($rewritingUrl instanceof \Thelia\Model\RewritingUrl) {
+ return $this
+ ->addUsingAlias(RewritingUrlTableMap::REDIRECTED, $rewritingUrl->getId(), $comparison);
+ } elseif ($rewritingUrl instanceof ObjectCollection) {
+ if (null === $comparison) {
+ $comparison = Criteria::IN;
+ }
+
+ return $this
+ ->addUsingAlias(RewritingUrlTableMap::REDIRECTED, $rewritingUrl->toKeyValue('PrimaryKey', 'Id'), $comparison);
+ } else {
+ throw new PropelException('filterByRewritingUrlRelatedByRedirected() only accepts arguments of type \Thelia\Model\RewritingUrl or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the RewritingUrlRelatedByRedirected relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function joinRewritingUrlRelatedByRedirected($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('RewritingUrlRelatedByRedirected');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'RewritingUrlRelatedByRedirected');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the RewritingUrlRelatedByRedirected relation RewritingUrl object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query
+ */
+ public function useRewritingUrlRelatedByRedirectedQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ {
+ return $this
+ ->joinRewritingUrlRelatedByRedirected($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'RewritingUrlRelatedByRedirected', '\Thelia\Model\RewritingUrlQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\RewritingUrl object
+ *
+ * @param \Thelia\Model\RewritingUrl|ObjectCollection $rewritingUrl the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByRewritingUrlRelatedById($rewritingUrl, $comparison = null)
+ {
+ if ($rewritingUrl instanceof \Thelia\Model\RewritingUrl) {
+ return $this
+ ->addUsingAlias(RewritingUrlTableMap::ID, $rewritingUrl->getRedirected(), $comparison);
+ } elseif ($rewritingUrl instanceof ObjectCollection) {
+ return $this
+ ->useRewritingUrlRelatedByIdQuery()
+ ->filterByPrimaryKeys($rewritingUrl->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByRewritingUrlRelatedById() only accepts arguments of type \Thelia\Model\RewritingUrl or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the RewritingUrlRelatedById relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function joinRewritingUrlRelatedById($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('RewritingUrlRelatedById');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'RewritingUrlRelatedById');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the RewritingUrlRelatedById relation RewritingUrl object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\RewritingUrlQuery A secondary query class using the current class as primary query
+ */
+ public function useRewritingUrlRelatedByIdQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+ {
+ return $this
+ ->joinRewritingUrlRelatedById($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'RewritingUrlRelatedById', '\Thelia\Model\RewritingUrlQuery');
+ }
+
+ /**
+ * Filter the query by a related \Thelia\Model\RewritingArgument object
+ *
+ * @param \Thelia\Model\RewritingArgument|ObjectCollection $rewritingArgument the related object to use as filter
+ * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function filterByRewritingArgument($rewritingArgument, $comparison = null)
+ {
+ if ($rewritingArgument instanceof \Thelia\Model\RewritingArgument) {
+ return $this
+ ->addUsingAlias(RewritingUrlTableMap::ID, $rewritingArgument->getRewritingUrlId(), $comparison);
+ } elseif ($rewritingArgument instanceof ObjectCollection) {
+ return $this
+ ->useRewritingArgumentQuery()
+ ->filterByPrimaryKeys($rewritingArgument->getPrimaryKeys())
+ ->endUse();
+ } else {
+ throw new PropelException('filterByRewritingArgument() only accepts arguments of type \Thelia\Model\RewritingArgument or Collection');
+ }
+ }
+
+ /**
+ * Adds a JOIN clause to the query using the RewritingArgument relation
+ *
+ * @param string $relationAlias optional alias for the relation
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function joinRewritingArgument($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ $tableMap = $this->getTableMap();
+ $relationMap = $tableMap->getRelation('RewritingArgument');
+
+ // create a ModelJoin object for this join
+ $join = new ModelJoin();
+ $join->setJoinType($joinType);
+ $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+ if ($previousJoin = $this->getPreviousJoin()) {
+ $join->setPreviousJoin($previousJoin);
+ }
+
+ // add the ModelJoin to the current object
+ if ($relationAlias) {
+ $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+ $this->addJoinObject($join, $relationAlias);
+ } else {
+ $this->addJoinObject($join, 'RewritingArgument');
+ }
+
+ return $this;
+ }
+
+ /**
+ * Use the RewritingArgument relation RewritingArgument object
+ *
+ * @see useQuery()
+ *
+ * @param string $relationAlias optional alias for the relation,
+ * to be used as main alias in the secondary query
+ * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+ *
+ * @return \Thelia\Model\RewritingArgumentQuery A secondary query class using the current class as primary query
+ */
+ public function useRewritingArgumentQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN)
+ {
+ return $this
+ ->joinRewritingArgument($relationAlias, $joinType)
+ ->useQuery($relationAlias ? $relationAlias : 'RewritingArgument', '\Thelia\Model\RewritingArgumentQuery');
+ }
+
+ /**
+ * Exclude object from result
+ *
+ * @param ChildRewritingUrl $rewritingUrl Object to remove from the list of results
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function prune($rewritingUrl = null)
+ {
+ if ($rewritingUrl) {
+ $this->addUsingAlias(RewritingUrlTableMap::ID, $rewritingUrl->getId(), Criteria::NOT_EQUAL);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Deletes all rows from the rewriting_url table.
+ *
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver).
+ */
+ public function doDeleteAll(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+ $affectedRows = 0; // initialize var to track total num of affected rows
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+ $affectedRows += parent::doDeleteAll($con);
+ // Because this db requires some delete cascade/set null emulation, we have to
+ // clear the cached instance *after* the emulation has happened (since
+ // instances get re-added by the select statement contained therein).
+ RewritingUrlTableMap::clearInstancePool();
+ RewritingUrlTableMap::clearRelatedInstancePool();
+
+ $con->commit();
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+
+ return $affectedRows;
+ }
+
+ /**
+ * Performs a DELETE on the database, given a ChildRewritingUrl or Criteria object OR a primary key value.
+ *
+ * @param mixed $values Criteria or ChildRewritingUrl object or primary key or array of primary keys
+ * which is used to create the DELETE statement
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
+ * if supported by native driver or if emulated using Propel.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public function delete(ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
+ }
+
+ $criteria = $this;
+
+ // Set the correct dbName
+ $criteria->setDbName(RewritingUrlTableMap::DATABASE_NAME);
+
+ $affectedRows = 0; // initialize var to track total num of affected rows
+
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table or we could emulating ON DELETE CASCADE, etc.
+ $con->beginTransaction();
+
+
+ RewritingUrlTableMap::removeInstanceFromPool($criteria);
+
+ $affectedRows += ModelCriteria::delete($con);
+ RewritingUrlTableMap::clearRelatedInstancePool();
+ $con->commit();
+
+ return $affectedRows;
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+ }
+
+ // timestampable behavior
+
+ /**
+ * Filter by the latest updated
+ *
+ * @param int $nbDays Maximum age of the latest update in days
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function recentlyUpdated($nbDays = 7)
+ {
+ return $this->addUsingAlias(RewritingUrlTableMap::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Filter by the latest created
+ *
+ * @param int $nbDays Maximum age of in days
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function recentlyCreated($nbDays = 7)
+ {
+ return $this->addUsingAlias(RewritingUrlTableMap::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+ }
+
+ /**
+ * Order by update date desc
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function lastUpdatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(RewritingUrlTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by update date asc
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function firstUpdatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(RewritingUrlTableMap::UPDATED_AT);
+ }
+
+ /**
+ * Order by create date desc
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function lastCreatedFirst()
+ {
+ return $this->addDescendingOrderByColumn(RewritingUrlTableMap::CREATED_AT);
+ }
+
+ /**
+ * Order by create date asc
+ *
+ * @return ChildRewritingUrlQuery The current query, for fluid interface
+ */
+ public function firstCreatedFirst()
+ {
+ return $this->addAscendingOrderByColumn(RewritingUrlTableMap::CREATED_AT);
+ }
+
+} // RewritingUrlQuery
diff --git a/core/lib/Thelia/Model/CartItem.php b/core/lib/Thelia/Model/CartItem.php
index 39408763e..fbfbee32c 100755
--- a/core/lib/Thelia/Model/CartItem.php
+++ b/core/lib/Thelia/Model/CartItem.php
@@ -4,10 +4,10 @@ namespace Thelia\Model;
use Propel\Runtime\Connection\ConnectionInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Thelia\Core\Event\Internal\CartEvent;
use Thelia\Core\Event\TheliaEvents;
use Thelia\Model\Base\CartItem as BaseCartItem;
use Thelia\Model\ConfigQuery;
+use Thelia\Core\Event\CartEvent;
class CartItem extends BaseCartItem
{
diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php
index a6a4927b2..d7418a4ea 100755
--- a/core/lib/Thelia/Model/Customer.php
+++ b/core/lib/Thelia/Model/Customer.php
@@ -3,7 +3,6 @@
namespace Thelia\Model;
use Symfony\Component\Config\Definition\Exception\Exception;
-use Thelia\Core\Event\Internal\CustomerEvent;
use Thelia\Model\Base\Customer as BaseCustomer;
use Thelia\Model\Exception\InvalidArgumentException;
@@ -17,6 +16,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
use Propel\Runtime\Propel;
use Thelia\Model\Map\CustomerTableMap;
use Thelia\Core\Security\Role\Role;
+use Thelia\Core\Event\CustomerEvent;
/**
* Skeleton subclass for representing a row from the 'customer' table.
diff --git a/core/lib/Thelia/Model/Map/CategoryTableMap.php b/core/lib/Thelia/Model/Map/CategoryTableMap.php
index f94b14e5f..5e692c00f 100755
--- a/core/lib/Thelia/Model/Map/CategoryTableMap.php
+++ b/core/lib/Thelia/Model/Map/CategoryTableMap.php
@@ -193,7 +193,6 @@ class CategoryTableMap extends TableMap
$this->addRelation('ProductCategory', '\\Thelia\\Model\\ProductCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'ProductCategories');
$this->addRelation('FeatureCategory', '\\Thelia\\Model\\FeatureCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'FeatureCategories');
$this->addRelation('AttributeCategory', '\\Thelia\\Model\\AttributeCategory', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'AttributeCategories');
- $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'Rewritings');
$this->addRelation('CategoryImage', '\\Thelia\\Model\\CategoryImage', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryImages');
$this->addRelation('CategoryDocument', '\\Thelia\\Model\\CategoryDocument', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryDocuments');
$this->addRelation('CategoryAssociatedContent', '\\Thelia\\Model\\CategoryAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'category_id', ), 'CASCADE', 'RESTRICT', 'CategoryAssociatedContents');
@@ -228,7 +227,6 @@ class CategoryTableMap extends TableMap
ProductCategoryTableMap::clearInstancePool();
FeatureCategoryTableMap::clearInstancePool();
AttributeCategoryTableMap::clearInstancePool();
- RewritingTableMap::clearInstancePool();
CategoryImageTableMap::clearInstancePool();
CategoryDocumentTableMap::clearInstancePool();
CategoryAssociatedContentTableMap::clearInstancePool();
diff --git a/core/lib/Thelia/Model/Map/ContentTableMap.php b/core/lib/Thelia/Model/Map/ContentTableMap.php
index 5b6787a28..f89e7fd20 100755
--- a/core/lib/Thelia/Model/Map/ContentTableMap.php
+++ b/core/lib/Thelia/Model/Map/ContentTableMap.php
@@ -184,7 +184,6 @@ class ContentTableMap extends TableMap
*/
public function buildRelations()
{
- $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'Rewritings');
$this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders');
$this->addRelation('ContentImage', '\\Thelia\\Model\\ContentImage', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentImages');
$this->addRelation('ContentDocument', '\\Thelia\\Model\\ContentDocument', RelationMap::ONE_TO_MANY, array('id' => 'content_id', ), 'CASCADE', 'RESTRICT', 'ContentDocuments');
@@ -216,7 +215,6 @@ class ContentTableMap extends TableMap
{
// Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
- RewritingTableMap::clearInstancePool();
ContentFolderTableMap::clearInstancePool();
ContentImageTableMap::clearInstancePool();
ContentDocumentTableMap::clearInstancePool();
diff --git a/core/lib/Thelia/Model/Map/FolderTableMap.php b/core/lib/Thelia/Model/Map/FolderTableMap.php
index 08871715b..7f4dde6d0 100755
--- a/core/lib/Thelia/Model/Map/FolderTableMap.php
+++ b/core/lib/Thelia/Model/Map/FolderTableMap.php
@@ -190,7 +190,6 @@ class FolderTableMap extends TableMap
*/
public function buildRelations()
{
- $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'Rewritings');
$this->addRelation('ContentFolder', '\\Thelia\\Model\\ContentFolder', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'ContentFolders');
$this->addRelation('FolderImage', '\\Thelia\\Model\\FolderImage', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderImages');
$this->addRelation('FolderDocument', '\\Thelia\\Model\\FolderDocument', RelationMap::ONE_TO_MANY, array('id' => 'folder_id', ), 'CASCADE', 'RESTRICT', 'FolderDocuments');
@@ -220,7 +219,6 @@ class FolderTableMap extends TableMap
{
// Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
// since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
- RewritingTableMap::clearInstancePool();
ContentFolderTableMap::clearInstancePool();
FolderImageTableMap::clearInstancePool();
FolderDocumentTableMap::clearInstancePool();
diff --git a/core/lib/Thelia/Model/Map/ProductTableMap.php b/core/lib/Thelia/Model/Map/ProductTableMap.php
index 81badfba0..1d46d483e 100755
--- a/core/lib/Thelia/Model/Map/ProductTableMap.php
+++ b/core/lib/Thelia/Model/Map/ProductTableMap.php
@@ -204,7 +204,6 @@ class ProductTableMap extends TableMap
$this->addRelation('ProductDocument', '\\Thelia\\Model\\ProductDocument', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductDocuments');
$this->addRelation('AccessoryRelatedByProductId', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByProductId');
$this->addRelation('AccessoryRelatedByAccessory', '\\Thelia\\Model\\Accessory', RelationMap::ONE_TO_MANY, array('id' => 'accessory', ), 'CASCADE', 'RESTRICT', 'AccessoriesRelatedByAccessory');
- $this->addRelation('Rewriting', '\\Thelia\\Model\\Rewriting', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'Rewritings');
$this->addRelation('CartItem', '\\Thelia\\Model\\CartItem', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), null, null, 'CartItems');
$this->addRelation('ProductAssociatedContent', '\\Thelia\\Model\\ProductAssociatedContent', RelationMap::ONE_TO_MANY, array('id' => 'product_id', ), 'CASCADE', 'RESTRICT', 'ProductAssociatedContents');
$this->addRelation('ProductI18n', '\\Thelia\\Model\\ProductI18n', RelationMap::ONE_TO_MANY, array('id' => 'id', ), 'CASCADE', null, 'ProductI18ns');
@@ -241,7 +240,6 @@ class ProductTableMap extends TableMap
ProductImageTableMap::clearInstancePool();
ProductDocumentTableMap::clearInstancePool();
AccessoryTableMap::clearInstancePool();
- RewritingTableMap::clearInstancePool();
ProductAssociatedContentTableMap::clearInstancePool();
ProductI18nTableMap::clearInstancePool();
ProductVersionTableMap::clearInstancePool();
diff --git a/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php b/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php
new file mode 100644
index 000000000..45c75c983
--- /dev/null
+++ b/core/lib/Thelia/Model/Map/RewritingArgumentTableMap.php
@@ -0,0 +1,503 @@
+ array('RewritingUrlId', 'Parameter', 'Value', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('rewritingUrlId', 'parameter', 'value', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(RewritingArgumentTableMap::REWRITING_URL_ID, RewritingArgumentTableMap::PARAMETER, RewritingArgumentTableMap::VALUE, RewritingArgumentTableMap::CREATED_AT, RewritingArgumentTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('REWRITING_URL_ID', 'PARAMETER', 'VALUE', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('rewriting_url_id', 'parameter', 'value', 'created_at', 'updated_at', ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, )
+ );
+
+ /**
+ * holds an array of keys for quick access to the fieldnames array
+ *
+ * first dimension keys are the type constants
+ * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+ */
+ protected static $fieldKeys = array (
+ self::TYPE_PHPNAME => array('RewritingUrlId' => 0, 'Parameter' => 1, 'Value' => 2, 'CreatedAt' => 3, 'UpdatedAt' => 4, ),
+ self::TYPE_STUDLYPHPNAME => array('rewritingUrlId' => 0, 'parameter' => 1, 'value' => 2, 'createdAt' => 3, 'updatedAt' => 4, ),
+ self::TYPE_COLNAME => array(RewritingArgumentTableMap::REWRITING_URL_ID => 0, RewritingArgumentTableMap::PARAMETER => 1, RewritingArgumentTableMap::VALUE => 2, RewritingArgumentTableMap::CREATED_AT => 3, RewritingArgumentTableMap::UPDATED_AT => 4, ),
+ self::TYPE_RAW_COLNAME => array('REWRITING_URL_ID' => 0, 'PARAMETER' => 1, 'VALUE' => 2, 'CREATED_AT' => 3, 'UPDATED_AT' => 4, ),
+ self::TYPE_FIELDNAME => array('rewriting_url_id' => 0, 'parameter' => 1, 'value' => 2, 'created_at' => 3, 'updated_at' => 4, ),
+ self::TYPE_NUM => array(0, 1, 2, 3, 4, )
+ );
+
+ /**
+ * Initialize the table attributes and columns
+ * Relations are not initialized by this method since they are lazy loaded
+ *
+ * @return void
+ * @throws PropelException
+ */
+ public function initialize()
+ {
+ // attributes
+ $this->setName('rewriting_argument');
+ $this->setPhpName('RewritingArgument');
+ $this->setClassName('\\Thelia\\Model\\RewritingArgument');
+ $this->setPackage('Thelia.Model');
+ $this->setUseIdGenerator(false);
+ // columns
+ $this->addForeignPrimaryKey('REWRITING_URL_ID', 'RewritingUrlId', 'INTEGER' , 'rewriting_url', 'ID', true, null, null);
+ $this->addPrimaryKey('PARAMETER', 'Parameter', 'VARCHAR', true, 255, null);
+ $this->addPrimaryKey('VALUE', 'Value', 'VARCHAR', true, 255, null);
+ $this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
+ $this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+ } // initialize()
+
+ /**
+ * Build the RelationMap objects for this table relationships
+ */
+ public function buildRelations()
+ {
+ $this->addRelation('RewritingUrl', '\\Thelia\\Model\\RewritingUrl', RelationMap::MANY_TO_ONE, array('rewriting_url_id' => 'id', ), 'CASCADE', 'RESTRICT');
+ } // buildRelations()
+
+ /**
+ *
+ * Gets the list of behaviors registered for this table
+ *
+ * @return array Associative array (name => parameters) of behaviors
+ */
+ public function getBehaviors()
+ {
+ return array(
+ 'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
+ );
+ } // getBehaviors()
+
+ /**
+ * Adds an object to the instance pool.
+ *
+ * Propel keeps cached copies of objects in an instance pool when they are retrieved
+ * from the database. In some cases you may need to explicitly add objects
+ * to the cache in order to ensure that the same objects are always returned by find*()
+ * and findPk*() calls.
+ *
+ * @param \Thelia\Model\RewritingArgument $obj A \Thelia\Model\RewritingArgument object.
+ * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally).
+ */
+ public static function addInstanceToPool($obj, $key = null)
+ {
+ if (Propel::isInstancePoolingEnabled()) {
+ if (null === $key) {
+ $key = serialize(array((string) $obj->getRewritingUrlId(), (string) $obj->getParameter(), (string) $obj->getValue()));
+ } // if key === null
+ self::$instances[$key] = $obj;
+ }
+ }
+
+ /**
+ * Removes an object from the instance pool.
+ *
+ * Propel keeps cached copies of objects in an instance pool when they are retrieved
+ * from the database. In some cases -- especially when you override doDelete
+ * methods in your stub classes -- you may need to explicitly remove objects
+ * from the cache in order to prevent returning objects that no longer exist.
+ *
+ * @param mixed $value A \Thelia\Model\RewritingArgument object or a primary key value.
+ */
+ public static function removeInstanceFromPool($value)
+ {
+ if (Propel::isInstancePoolingEnabled() && null !== $value) {
+ if (is_object($value) && $value instanceof \Thelia\Model\RewritingArgument) {
+ $key = serialize(array((string) $value->getRewritingUrlId(), (string) $value->getParameter(), (string) $value->getValue()));
+
+ } elseif (is_array($value) && count($value) === 3) {
+ // assume we've been passed a primary key";
+ $key = serialize(array((string) $value[0], (string) $value[1], (string) $value[2]));
+ } elseif ($value instanceof Criteria) {
+ self::$instances = [];
+
+ return;
+ } else {
+ $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or \Thelia\Model\RewritingArgument object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value, true)));
+ throw $e;
+ }
+
+ unset(self::$instances[$key]);
+ }
+ }
+
+ /**
+ * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+ *
+ * For tables with a single-column primary key, that simple pkey value will be returned. For tables with
+ * a multi-column primary key, a serialize()d version of the primary key will be returned.
+ *
+ * @param array $row resultset row.
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+ */
+ public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+ // If the PK cannot be derived from the row, return NULL.
+ if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('RewritingUrlId', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Parameter', TableMap::TYPE_PHPNAME, $indexType)] === null && $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+ return null;
+ }
+
+ return serialize(array((string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('RewritingUrlId', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 1 + $offset : static::translateFieldName('Parameter', TableMap::TYPE_PHPNAME, $indexType)], (string) $row[TableMap::TYPE_NUM == $indexType ? 2 + $offset : static::translateFieldName('Value', TableMap::TYPE_PHPNAME, $indexType)]));
+ }
+
+ /**
+ * Retrieves the primary key from the DB resultset row
+ * For tables with a single-column primary key, that simple pkey value will be returned. For tables with
+ * a multi-column primary key, an array of the primary key columns will be returned.
+ *
+ * @param array $row resultset row.
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+ *
+ * @return mixed The primary key of the row
+ */
+ public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+
+ return $pks;
+ }
+
+ /**
+ * The class that the tableMap will make instances of.
+ *
+ * If $withPrefix is true, the returned path
+ * uses a dot-path notation which is translated into a path
+ * relative to a location on the PHP include_path.
+ * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+ *
+ * @param boolean $withPrefix Whether or not to return the path with the class name
+ * @return string path.to.ClassName
+ */
+ public static function getOMClass($withPrefix = true)
+ {
+ return $withPrefix ? RewritingArgumentTableMap::CLASS_DEFAULT : RewritingArgumentTableMap::OM_CLASS;
+ }
+
+ /**
+ * Populates an object of the default type or an object that inherit from the default.
+ *
+ * @param array $row row returned by DataFetcher->fetch().
+ * @param int $offset The 0-based offset for reading from the resultset row.
+ * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+ One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_STUDLYPHPNAME
+ * TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+ *
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ * @return array (RewritingArgument object, last column rank)
+ */
+ public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+ {
+ $key = RewritingArgumentTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+ if (null !== ($obj = RewritingArgumentTableMap::getInstanceFromPool($key))) {
+ // We no longer rehydrate the object, since this can cause data loss.
+ // See http://www.propelorm.org/ticket/509
+ // $obj->hydrate($row, $offset, true); // rehydrate
+ $col = $offset + RewritingArgumentTableMap::NUM_HYDRATE_COLUMNS;
+ } else {
+ $cls = RewritingArgumentTableMap::OM_CLASS;
+ $obj = new $cls();
+ $col = $obj->hydrate($row, $offset, false, $indexType);
+ RewritingArgumentTableMap::addInstanceToPool($obj, $key);
+ }
+
+ return array($obj, $col);
+ }
+
+ /**
+ * The returned array will contain objects of the default type or
+ * objects that inherit from the default.
+ *
+ * @param DataFetcherInterface $dataFetcher
+ * @return array
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function populateObjects(DataFetcherInterface $dataFetcher)
+ {
+ $results = array();
+
+ // set the class once to avoid overhead in the loop
+ $cls = static::getOMClass(false);
+ // populate the object(s)
+ while ($row = $dataFetcher->fetch()) {
+ $key = RewritingArgumentTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+ if (null !== ($obj = RewritingArgumentTableMap::getInstanceFromPool($key))) {
+ // We no longer rehydrate the object, since this can cause data loss.
+ // See http://www.propelorm.org/ticket/509
+ // $obj->hydrate($row, 0, true); // rehydrate
+ $results[] = $obj;
+ } else {
+ $obj = new $cls();
+ $obj->hydrate($row);
+ $results[] = $obj;
+ RewritingArgumentTableMap::addInstanceToPool($obj, $key);
+ } // if key exists
+ }
+
+ return $results;
+ }
+ /**
+ * Add all the columns needed to create a new object.
+ *
+ * Note: any columns that were marked with lazyLoad="true" in the
+ * XML schema will not be added to the select list and only loaded
+ * on demand.
+ *
+ * @param Criteria $criteria object containing the columns to add.
+ * @param string $alias optional table alias
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function addSelectColumns(Criteria $criteria, $alias = null)
+ {
+ if (null === $alias) {
+ $criteria->addSelectColumn(RewritingArgumentTableMap::REWRITING_URL_ID);
+ $criteria->addSelectColumn(RewritingArgumentTableMap::PARAMETER);
+ $criteria->addSelectColumn(RewritingArgumentTableMap::VALUE);
+ $criteria->addSelectColumn(RewritingArgumentTableMap::CREATED_AT);
+ $criteria->addSelectColumn(RewritingArgumentTableMap::UPDATED_AT);
+ } else {
+ $criteria->addSelectColumn($alias . '.REWRITING_URL_ID');
+ $criteria->addSelectColumn($alias . '.PARAMETER');
+ $criteria->addSelectColumn($alias . '.VALUE');
+ $criteria->addSelectColumn($alias . '.CREATED_AT');
+ $criteria->addSelectColumn($alias . '.UPDATED_AT');
+ }
+ }
+
+ /**
+ * Returns the TableMap related to this object.
+ * This method is not needed for general use but a specific application could have a need.
+ * @return TableMap
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function getTableMap()
+ {
+ return Propel::getServiceContainer()->getDatabaseMap(RewritingArgumentTableMap::DATABASE_NAME)->getTable(RewritingArgumentTableMap::TABLE_NAME);
+ }
+
+ /**
+ * Add a TableMap instance to the database for this tableMap class.
+ */
+ public static function buildTableMap()
+ {
+ $dbMap = Propel::getServiceContainer()->getDatabaseMap(RewritingArgumentTableMap::DATABASE_NAME);
+ if (!$dbMap->hasTable(RewritingArgumentTableMap::TABLE_NAME)) {
+ $dbMap->addTableObject(new RewritingArgumentTableMap());
+ }
+ }
+
+ /**
+ * Performs a DELETE on the database, given a RewritingArgument or Criteria object OR a primary key value.
+ *
+ * @param mixed $values Criteria or RewritingArgument object or primary key or array of primary keys
+ * which is used to create the DELETE statement
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
+ * if supported by native driver or if emulated using Propel.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doDelete($values, ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
+ }
+
+ if ($values instanceof Criteria) {
+ // rename for clarity
+ $criteria = $values;
+ } elseif ($values instanceof \Thelia\Model\RewritingArgument) { // it's a model object
+ // create criteria based on pk values
+ $criteria = $values->buildPkeyCriteria();
+ } else { // it's a primary key, or an array of pks
+ $criteria = new Criteria(RewritingArgumentTableMap::DATABASE_NAME);
+ // primary key is composite; we therefore, expect
+ // the primary key passed to be an array of pkey values
+ if (count($values) == count($values, COUNT_RECURSIVE)) {
+ // array is not multi-dimensional
+ $values = array($values);
+ }
+ foreach ($values as $value) {
+ $criterion = $criteria->getNewCriterion(RewritingArgumentTableMap::REWRITING_URL_ID, $value[0]);
+ $criterion->addAnd($criteria->getNewCriterion(RewritingArgumentTableMap::PARAMETER, $value[1]));
+ $criterion->addAnd($criteria->getNewCriterion(RewritingArgumentTableMap::VALUE, $value[2]));
+ $criteria->addOr($criterion);
+ }
+ }
+
+ $query = RewritingArgumentQuery::create()->mergeWith($criteria);
+
+ if ($values instanceof Criteria) { RewritingArgumentTableMap::clearInstancePool();
+ } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+ foreach ((array) $values as $singleval) { RewritingArgumentTableMap::removeInstanceFromPool($singleval);
+ }
+ }
+
+ return $query->delete($con);
+ }
+
+ /**
+ * Deletes all rows from the rewriting_argument table.
+ *
+ * @param ConnectionInterface $con the connection to use
+ * @return int The number of affected rows (if supported by underlying database driver).
+ */
+ public static function doDeleteAll(ConnectionInterface $con = null)
+ {
+ return RewritingArgumentQuery::create()->doDeleteAll($con);
+ }
+
+ /**
+ * Performs an INSERT on the database, given a RewritingArgument or Criteria object.
+ *
+ * @param mixed $criteria Criteria or RewritingArgument object containing data that is used to create the INSERT statement.
+ * @param ConnectionInterface $con the ConnectionInterface connection to use
+ * @return mixed The new primary key.
+ * @throws PropelException Any exceptions caught during processing will be
+ * rethrown wrapped into a PropelException.
+ */
+ public static function doInsert($criteria, ConnectionInterface $con = null)
+ {
+ if (null === $con) {
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingArgumentTableMap::DATABASE_NAME);
+ }
+
+ if ($criteria instanceof Criteria) {
+ $criteria = clone $criteria; // rename for clarity
+ } else {
+ $criteria = $criteria->buildCriteria(); // build Criteria from RewritingArgument object
+ }
+
+
+ // Set the correct dbName
+ $query = RewritingArgumentQuery::create()->mergeWith($criteria);
+
+ try {
+ // use transaction because $criteria could contain info
+ // for more than one table (I guess, conceivably)
+ $con->beginTransaction();
+ $pk = $query->doInsert($con);
+ $con->commit();
+ } catch (PropelException $e) {
+ $con->rollBack();
+ throw $e;
+ }
+
+ return $pk;
+ }
+
+} // RewritingArgumentTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+RewritingArgumentTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Map/RewritingTableMap.php b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
old mode 100755
new mode 100644
similarity index 63%
rename from core/lib/Thelia/Model/Map/RewritingTableMap.php
rename to core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
index afce3e3c7..c6d5e5473
--- a/core/lib/Thelia/Model/Map/RewritingTableMap.php
+++ b/core/lib/Thelia/Model/Map/RewritingUrlTableMap.php
@@ -10,12 +10,12 @@ use Propel\Runtime\Exception\PropelException;
use Propel\Runtime\Map\RelationMap;
use Propel\Runtime\Map\TableMap;
use Propel\Runtime\Map\TableMapTrait;
-use Thelia\Model\Rewriting;
-use Thelia\Model\RewritingQuery;
+use Thelia\Model\RewritingUrl;
+use Thelia\Model\RewritingUrlQuery;
/**
- * This class defines the structure of the 'rewriting' table.
+ * This class defines the structure of the 'rewriting_url' table.
*
*
*
@@ -25,14 +25,14 @@ use Thelia\Model\RewritingQuery;
* (i.e. if it's a text column type).
*
*/
-class RewritingTableMap extends TableMap
+class RewritingUrlTableMap extends TableMap
{
use InstancePoolTrait;
use TableMapTrait;
/**
* The (dot-path) name of this class
*/
- const CLASS_NAME = 'Thelia.Model.Map.RewritingTableMap';
+ const CLASS_NAME = 'Thelia.Model.Map.RewritingUrlTableMap';
/**
* The default database name for this class
@@ -42,17 +42,17 @@ class RewritingTableMap extends TableMap
/**
* The table name for this class
*/
- const TABLE_NAME = 'rewriting';
+ const TABLE_NAME = 'rewriting_url';
/**
* The related Propel class for this table
*/
- const OM_CLASS = '\\Thelia\\Model\\Rewriting';
+ const OM_CLASS = '\\Thelia\\Model\\RewritingUrl';
/**
* A class that can be returned by this tableMap
*/
- const CLASS_DEFAULT = 'Thelia.Model.Rewriting';
+ const CLASS_DEFAULT = 'Thelia.Model.RewritingUrl';
/**
* The total number of columns
@@ -72,42 +72,42 @@ class RewritingTableMap extends TableMap
/**
* the column name for the ID field
*/
- const ID = 'rewriting.ID';
+ const ID = 'rewriting_url.ID';
/**
* the column name for the URL field
*/
- const URL = 'rewriting.URL';
+ const URL = 'rewriting_url.URL';
/**
- * the column name for the PRODUCT_ID field
+ * the column name for the VIEW field
*/
- const PRODUCT_ID = 'rewriting.PRODUCT_ID';
+ const VIEW = 'rewriting_url.VIEW';
/**
- * the column name for the CATEGORY_ID field
+ * the column name for the VIEW_ID field
*/
- const CATEGORY_ID = 'rewriting.CATEGORY_ID';
+ const VIEW_ID = 'rewriting_url.VIEW_ID';
/**
- * the column name for the FOLDER_ID field
+ * the column name for the VIEW_LOCALE field
*/
- const FOLDER_ID = 'rewriting.FOLDER_ID';
+ const VIEW_LOCALE = 'rewriting_url.VIEW_LOCALE';
/**
- * the column name for the CONTENT_ID field
+ * the column name for the REDIRECTED field
*/
- const CONTENT_ID = 'rewriting.CONTENT_ID';
+ const REDIRECTED = 'rewriting_url.REDIRECTED';
/**
* the column name for the CREATED_AT field
*/
- const CREATED_AT = 'rewriting.CREATED_AT';
+ const CREATED_AT = 'rewriting_url.CREATED_AT';
/**
* the column name for the UPDATED_AT field
*/
- const UPDATED_AT = 'rewriting.UPDATED_AT';
+ const UPDATED_AT = 'rewriting_url.UPDATED_AT';
/**
* The default string format for model objects of the related table
@@ -121,11 +121,11 @@ class RewritingTableMap extends TableMap
* e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
*/
protected static $fieldNames = array (
- self::TYPE_PHPNAME => array('Id', 'Url', 'ProductId', 'CategoryId', 'FolderId', 'ContentId', 'CreatedAt', 'UpdatedAt', ),
- self::TYPE_STUDLYPHPNAME => array('id', 'url', 'productId', 'categoryId', 'folderId', 'contentId', 'createdAt', 'updatedAt', ),
- self::TYPE_COLNAME => array(RewritingTableMap::ID, RewritingTableMap::URL, RewritingTableMap::PRODUCT_ID, RewritingTableMap::CATEGORY_ID, RewritingTableMap::FOLDER_ID, RewritingTableMap::CONTENT_ID, RewritingTableMap::CREATED_AT, RewritingTableMap::UPDATED_AT, ),
- self::TYPE_RAW_COLNAME => array('ID', 'URL', 'PRODUCT_ID', 'CATEGORY_ID', 'FOLDER_ID', 'CONTENT_ID', 'CREATED_AT', 'UPDATED_AT', ),
- self::TYPE_FIELDNAME => array('id', 'url', 'product_id', 'category_id', 'folder_id', 'content_id', 'created_at', 'updated_at', ),
+ self::TYPE_PHPNAME => array('Id', 'Url', 'View', 'ViewId', 'ViewLocale', 'Redirected', 'CreatedAt', 'UpdatedAt', ),
+ self::TYPE_STUDLYPHPNAME => array('id', 'url', 'view', 'viewId', 'viewLocale', 'redirected', 'createdAt', 'updatedAt', ),
+ self::TYPE_COLNAME => array(RewritingUrlTableMap::ID, RewritingUrlTableMap::URL, RewritingUrlTableMap::VIEW, RewritingUrlTableMap::VIEW_ID, RewritingUrlTableMap::VIEW_LOCALE, RewritingUrlTableMap::REDIRECTED, RewritingUrlTableMap::CREATED_AT, RewritingUrlTableMap::UPDATED_AT, ),
+ self::TYPE_RAW_COLNAME => array('ID', 'URL', 'VIEW', 'VIEW_ID', 'VIEW_LOCALE', 'REDIRECTED', 'CREATED_AT', 'UPDATED_AT', ),
+ self::TYPE_FIELDNAME => array('id', 'url', 'view', 'view_id', 'view_locale', 'redirected', 'created_at', 'updated_at', ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
@@ -136,11 +136,11 @@ class RewritingTableMap extends TableMap
* e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
*/
protected static $fieldKeys = array (
- self::TYPE_PHPNAME => array('Id' => 0, 'Url' => 1, 'ProductId' => 2, 'CategoryId' => 3, 'FolderId' => 4, 'ContentId' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ),
- self::TYPE_STUDLYPHPNAME => array('id' => 0, 'url' => 1, 'productId' => 2, 'categoryId' => 3, 'folderId' => 4, 'contentId' => 5, 'createdAt' => 6, 'updatedAt' => 7, ),
- self::TYPE_COLNAME => array(RewritingTableMap::ID => 0, RewritingTableMap::URL => 1, RewritingTableMap::PRODUCT_ID => 2, RewritingTableMap::CATEGORY_ID => 3, RewritingTableMap::FOLDER_ID => 4, RewritingTableMap::CONTENT_ID => 5, RewritingTableMap::CREATED_AT => 6, RewritingTableMap::UPDATED_AT => 7, ),
- self::TYPE_RAW_COLNAME => array('ID' => 0, 'URL' => 1, 'PRODUCT_ID' => 2, 'CATEGORY_ID' => 3, 'FOLDER_ID' => 4, 'CONTENT_ID' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ),
- self::TYPE_FIELDNAME => array('id' => 0, 'url' => 1, 'product_id' => 2, 'category_id' => 3, 'folder_id' => 4, 'content_id' => 5, 'created_at' => 6, 'updated_at' => 7, ),
+ self::TYPE_PHPNAME => array('Id' => 0, 'Url' => 1, 'View' => 2, 'ViewId' => 3, 'ViewLocale' => 4, 'Redirected' => 5, 'CreatedAt' => 6, 'UpdatedAt' => 7, ),
+ self::TYPE_STUDLYPHPNAME => array('id' => 0, 'url' => 1, 'view' => 2, 'viewId' => 3, 'viewLocale' => 4, 'redirected' => 5, 'createdAt' => 6, 'updatedAt' => 7, ),
+ self::TYPE_COLNAME => array(RewritingUrlTableMap::ID => 0, RewritingUrlTableMap::URL => 1, RewritingUrlTableMap::VIEW => 2, RewritingUrlTableMap::VIEW_ID => 3, RewritingUrlTableMap::VIEW_LOCALE => 4, RewritingUrlTableMap::REDIRECTED => 5, RewritingUrlTableMap::CREATED_AT => 6, RewritingUrlTableMap::UPDATED_AT => 7, ),
+ self::TYPE_RAW_COLNAME => array('ID' => 0, 'URL' => 1, 'VIEW' => 2, 'VIEW_ID' => 3, 'VIEW_LOCALE' => 4, 'REDIRECTED' => 5, 'CREATED_AT' => 6, 'UPDATED_AT' => 7, ),
+ self::TYPE_FIELDNAME => array('id' => 0, 'url' => 1, 'view' => 2, 'view_id' => 3, 'view_locale' => 4, 'redirected' => 5, 'created_at' => 6, 'updated_at' => 7, ),
self::TYPE_NUM => array(0, 1, 2, 3, 4, 5, 6, 7, )
);
@@ -154,18 +154,18 @@ class RewritingTableMap extends TableMap
public function initialize()
{
// attributes
- $this->setName('rewriting');
- $this->setPhpName('Rewriting');
- $this->setClassName('\\Thelia\\Model\\Rewriting');
+ $this->setName('rewriting_url');
+ $this->setPhpName('RewritingUrl');
+ $this->setClassName('\\Thelia\\Model\\RewritingUrl');
$this->setPackage('Thelia.Model');
- $this->setUseIdGenerator(false);
+ $this->setUseIdGenerator(true);
// columns
$this->addPrimaryKey('ID', 'Id', 'INTEGER', true, null, null);
$this->addColumn('URL', 'Url', 'VARCHAR', true, 255, null);
- $this->addForeignKey('PRODUCT_ID', 'ProductId', 'INTEGER', 'product', 'ID', false, null, null);
- $this->addForeignKey('CATEGORY_ID', 'CategoryId', 'INTEGER', 'category', 'ID', false, null, null);
- $this->addForeignKey('FOLDER_ID', 'FolderId', 'INTEGER', 'folder', 'ID', false, null, null);
- $this->addForeignKey('CONTENT_ID', 'ContentId', 'INTEGER', 'content', 'ID', false, null, null);
+ $this->addColumn('VIEW', 'View', 'VARCHAR', false, 255, null);
+ $this->addColumn('VIEW_ID', 'ViewId', 'VARCHAR', false, 255, null);
+ $this->addColumn('VIEW_LOCALE', 'ViewLocale', 'VARCHAR', false, 255, null);
+ $this->addForeignKey('REDIRECTED', 'Redirected', 'INTEGER', 'rewriting_url', 'ID', false, null, null);
$this->addColumn('CREATED_AT', 'CreatedAt', 'TIMESTAMP', false, null, null);
$this->addColumn('UPDATED_AT', 'UpdatedAt', 'TIMESTAMP', false, null, null);
} // initialize()
@@ -175,10 +175,9 @@ class RewritingTableMap extends TableMap
*/
public function buildRelations()
{
- $this->addRelation('Product', '\\Thelia\\Model\\Product', RelationMap::MANY_TO_ONE, array('product_id' => 'id', ), 'CASCADE', 'RESTRICT');
- $this->addRelation('Category', '\\Thelia\\Model\\Category', RelationMap::MANY_TO_ONE, array('category_id' => 'id', ), 'CASCADE', 'RESTRICT');
- $this->addRelation('Folder', '\\Thelia\\Model\\Folder', RelationMap::MANY_TO_ONE, array('folder_id' => 'id', ), 'CASCADE', 'RESTRICT');
- $this->addRelation('Content', '\\Thelia\\Model\\Content', RelationMap::MANY_TO_ONE, array('content_id' => 'id', ), 'CASCADE', 'RESTRICT');
+ $this->addRelation('RewritingUrlRelatedByRedirected', '\\Thelia\\Model\\RewritingUrl', RelationMap::MANY_TO_ONE, array('redirected' => 'id', ), 'RESTRICT', 'RESTRICT');
+ $this->addRelation('RewritingUrlRelatedById', '\\Thelia\\Model\\RewritingUrl', RelationMap::ONE_TO_MANY, array('id' => 'redirected', ), 'RESTRICT', 'RESTRICT', 'RewritingUrlsRelatedById');
+ $this->addRelation('RewritingArgument', '\\Thelia\\Model\\RewritingArgument', RelationMap::ONE_TO_MANY, array('id' => 'rewriting_url_id', ), 'CASCADE', 'RESTRICT', 'RewritingArguments');
} // buildRelations()
/**
@@ -193,6 +192,15 @@ class RewritingTableMap extends TableMap
'timestampable' => array('create_column' => 'created_at', 'update_column' => 'updated_at', ),
);
} // getBehaviors()
+ /**
+ * Method to invalidate the instance pool of all tables related to rewriting_url * by a foreign key with ON DELETE CASCADE
+ */
+ public static function clearRelatedInstancePool()
+ {
+ // Invalidate objects in ".$this->getClassNameFromBuilder($joinedTableTableMapBuilder)." instance pool,
+ // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule.
+ RewritingArgumentTableMap::clearInstancePool();
+ }
/**
* Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
@@ -250,7 +258,7 @@ class RewritingTableMap extends TableMap
*/
public static function getOMClass($withPrefix = true)
{
- return $withPrefix ? RewritingTableMap::CLASS_DEFAULT : RewritingTableMap::OM_CLASS;
+ return $withPrefix ? RewritingUrlTableMap::CLASS_DEFAULT : RewritingUrlTableMap::OM_CLASS;
}
/**
@@ -264,21 +272,21 @@ class RewritingTableMap extends TableMap
*
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
- * @return array (Rewriting object, last column rank)
+ * @return array (RewritingUrl object, last column rank)
*/
public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
{
- $key = RewritingTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
- if (null !== ($obj = RewritingTableMap::getInstanceFromPool($key))) {
+ $key = RewritingUrlTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+ if (null !== ($obj = RewritingUrlTableMap::getInstanceFromPool($key))) {
// We no longer rehydrate the object, since this can cause data loss.
// See http://www.propelorm.org/ticket/509
// $obj->hydrate($row, $offset, true); // rehydrate
- $col = $offset + RewritingTableMap::NUM_HYDRATE_COLUMNS;
+ $col = $offset + RewritingUrlTableMap::NUM_HYDRATE_COLUMNS;
} else {
- $cls = RewritingTableMap::OM_CLASS;
+ $cls = RewritingUrlTableMap::OM_CLASS;
$obj = new $cls();
$col = $obj->hydrate($row, $offset, false, $indexType);
- RewritingTableMap::addInstanceToPool($obj, $key);
+ RewritingUrlTableMap::addInstanceToPool($obj, $key);
}
return array($obj, $col);
@@ -301,8 +309,8 @@ class RewritingTableMap extends TableMap
$cls = static::getOMClass(false);
// populate the object(s)
while ($row = $dataFetcher->fetch()) {
- $key = RewritingTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
- if (null !== ($obj = RewritingTableMap::getInstanceFromPool($key))) {
+ $key = RewritingUrlTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+ if (null !== ($obj = RewritingUrlTableMap::getInstanceFromPool($key))) {
// We no longer rehydrate the object, since this can cause data loss.
// See http://www.propelorm.org/ticket/509
// $obj->hydrate($row, 0, true); // rehydrate
@@ -311,7 +319,7 @@ class RewritingTableMap extends TableMap
$obj = new $cls();
$obj->hydrate($row);
$results[] = $obj;
- RewritingTableMap::addInstanceToPool($obj, $key);
+ RewritingUrlTableMap::addInstanceToPool($obj, $key);
} // if key exists
}
@@ -332,21 +340,21 @@ class RewritingTableMap extends TableMap
public static function addSelectColumns(Criteria $criteria, $alias = null)
{
if (null === $alias) {
- $criteria->addSelectColumn(RewritingTableMap::ID);
- $criteria->addSelectColumn(RewritingTableMap::URL);
- $criteria->addSelectColumn(RewritingTableMap::PRODUCT_ID);
- $criteria->addSelectColumn(RewritingTableMap::CATEGORY_ID);
- $criteria->addSelectColumn(RewritingTableMap::FOLDER_ID);
- $criteria->addSelectColumn(RewritingTableMap::CONTENT_ID);
- $criteria->addSelectColumn(RewritingTableMap::CREATED_AT);
- $criteria->addSelectColumn(RewritingTableMap::UPDATED_AT);
+ $criteria->addSelectColumn(RewritingUrlTableMap::ID);
+ $criteria->addSelectColumn(RewritingUrlTableMap::URL);
+ $criteria->addSelectColumn(RewritingUrlTableMap::VIEW);
+ $criteria->addSelectColumn(RewritingUrlTableMap::VIEW_ID);
+ $criteria->addSelectColumn(RewritingUrlTableMap::VIEW_LOCALE);
+ $criteria->addSelectColumn(RewritingUrlTableMap::REDIRECTED);
+ $criteria->addSelectColumn(RewritingUrlTableMap::CREATED_AT);
+ $criteria->addSelectColumn(RewritingUrlTableMap::UPDATED_AT);
} else {
$criteria->addSelectColumn($alias . '.ID');
$criteria->addSelectColumn($alias . '.URL');
- $criteria->addSelectColumn($alias . '.PRODUCT_ID');
- $criteria->addSelectColumn($alias . '.CATEGORY_ID');
- $criteria->addSelectColumn($alias . '.FOLDER_ID');
- $criteria->addSelectColumn($alias . '.CONTENT_ID');
+ $criteria->addSelectColumn($alias . '.VIEW');
+ $criteria->addSelectColumn($alias . '.VIEW_ID');
+ $criteria->addSelectColumn($alias . '.VIEW_LOCALE');
+ $criteria->addSelectColumn($alias . '.REDIRECTED');
$criteria->addSelectColumn($alias . '.CREATED_AT');
$criteria->addSelectColumn($alias . '.UPDATED_AT');
}
@@ -361,7 +369,7 @@ class RewritingTableMap extends TableMap
*/
public static function getTableMap()
{
- return Propel::getServiceContainer()->getDatabaseMap(RewritingTableMap::DATABASE_NAME)->getTable(RewritingTableMap::TABLE_NAME);
+ return Propel::getServiceContainer()->getDatabaseMap(RewritingUrlTableMap::DATABASE_NAME)->getTable(RewritingUrlTableMap::TABLE_NAME);
}
/**
@@ -369,16 +377,16 @@ class RewritingTableMap extends TableMap
*/
public static function buildTableMap()
{
- $dbMap = Propel::getServiceContainer()->getDatabaseMap(RewritingTableMap::DATABASE_NAME);
- if (!$dbMap->hasTable(RewritingTableMap::TABLE_NAME)) {
- $dbMap->addTableObject(new RewritingTableMap());
+ $dbMap = Propel::getServiceContainer()->getDatabaseMap(RewritingUrlTableMap::DATABASE_NAME);
+ if (!$dbMap->hasTable(RewritingUrlTableMap::TABLE_NAME)) {
+ $dbMap->addTableObject(new RewritingUrlTableMap());
}
}
/**
- * Performs a DELETE on the database, given a Rewriting or Criteria object OR a primary key value.
+ * Performs a DELETE on the database, given a RewritingUrl or Criteria object OR a primary key value.
*
- * @param mixed $values Criteria or Rewriting object or primary key or array of primary keys
+ * @param mixed $values Criteria or RewritingUrl object or primary key or array of primary keys
* which is used to create the DELETE statement
* @param ConnectionInterface $con the connection to use
* @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows
@@ -389,25 +397,25 @@ class RewritingTableMap extends TableMap
public static function doDelete($values, ConnectionInterface $con = null)
{
if (null === $con) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
}
if ($values instanceof Criteria) {
// rename for clarity
$criteria = $values;
- } elseif ($values instanceof \Thelia\Model\Rewriting) { // it's a model object
+ } elseif ($values instanceof \Thelia\Model\RewritingUrl) { // it's a model object
// create criteria based on pk values
$criteria = $values->buildPkeyCriteria();
} else { // it's a primary key, or an array of pks
- $criteria = new Criteria(RewritingTableMap::DATABASE_NAME);
- $criteria->add(RewritingTableMap::ID, (array) $values, Criteria::IN);
+ $criteria = new Criteria(RewritingUrlTableMap::DATABASE_NAME);
+ $criteria->add(RewritingUrlTableMap::ID, (array) $values, Criteria::IN);
}
- $query = RewritingQuery::create()->mergeWith($criteria);
+ $query = RewritingUrlQuery::create()->mergeWith($criteria);
- if ($values instanceof Criteria) { RewritingTableMap::clearInstancePool();
+ if ($values instanceof Criteria) { RewritingUrlTableMap::clearInstancePool();
} elseif (!is_object($values)) { // it's a primary key, or an array of pks
- foreach ((array) $values as $singleval) { RewritingTableMap::removeInstanceFromPool($singleval);
+ foreach ((array) $values as $singleval) { RewritingUrlTableMap::removeInstanceFromPool($singleval);
}
}
@@ -415,20 +423,20 @@ class RewritingTableMap extends TableMap
}
/**
- * Deletes all rows from the rewriting table.
+ * Deletes all rows from the rewriting_url table.
*
* @param ConnectionInterface $con the connection to use
* @return int The number of affected rows (if supported by underlying database driver).
*/
public static function doDeleteAll(ConnectionInterface $con = null)
{
- return RewritingQuery::create()->doDeleteAll($con);
+ return RewritingUrlQuery::create()->doDeleteAll($con);
}
/**
- * Performs an INSERT on the database, given a Rewriting or Criteria object.
+ * Performs an INSERT on the database, given a RewritingUrl or Criteria object.
*
- * @param mixed $criteria Criteria or Rewriting object containing data that is used to create the INSERT statement.
+ * @param mixed $criteria Criteria or RewritingUrl object containing data that is used to create the INSERT statement.
* @param ConnectionInterface $con the ConnectionInterface connection to use
* @return mixed The new primary key.
* @throws PropelException Any exceptions caught during processing will be
@@ -437,18 +445,22 @@ class RewritingTableMap extends TableMap
public static function doInsert($criteria, ConnectionInterface $con = null)
{
if (null === $con) {
- $con = Propel::getServiceContainer()->getWriteConnection(RewritingTableMap::DATABASE_NAME);
+ $con = Propel::getServiceContainer()->getWriteConnection(RewritingUrlTableMap::DATABASE_NAME);
}
if ($criteria instanceof Criteria) {
$criteria = clone $criteria; // rename for clarity
} else {
- $criteria = $criteria->buildCriteria(); // build Criteria from Rewriting object
+ $criteria = $criteria->buildCriteria(); // build Criteria from RewritingUrl object
+ }
+
+ if ($criteria->containsKey(RewritingUrlTableMap::ID) && $criteria->keyContainsValue(RewritingUrlTableMap::ID) ) {
+ throw new PropelException('Cannot insert a value for auto-increment primary key ('.RewritingUrlTableMap::ID.')');
}
// Set the correct dbName
- $query = RewritingQuery::create()->mergeWith($criteria);
+ $query = RewritingUrlQuery::create()->mergeWith($criteria);
try {
// use transaction because $criteria could contain info
@@ -464,7 +476,7 @@ class RewritingTableMap extends TableMap
return $pk;
}
-} // RewritingTableMap
+} // RewritingUrlTableMap
// This is the static code needed to register the TableMap for this table with the main Propel class.
//
-RewritingTableMap::buildTableMap();
+RewritingUrlTableMap::buildTableMap();
diff --git a/core/lib/Thelia/Model/Rewriting.php b/core/lib/Thelia/Model/Rewriting.php
deleted file mode 100755
index 8d6f75fab..000000000
--- a/core/lib/Thelia/Model/Rewriting.php
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+