Commit graph

174 commits

Author SHA1 Message Date
Toni Uebernickel 58b80628dd Merge pull request #377 from nibsirahsieu/issue_365
set `defaultConnection` value for both `runtime` and `generator`
2016-02-11 20:27:32 +01:00
Toni Uebernickel 2557733f8c Merge pull request #397 from gharlan/changes-of-1.x
copy changes of 1.x to 2.x
2016-02-11 20:22:06 +01:00
Gregor Harlan 09db2ca042 corrected allow_failures part 2016-02-11 20:15:00 +01:00
Gregor Harlan 28f18fc4e5 require dev-master of propel 2016-02-11 19:48:20 +01:00
Gregor Harlan 2caf5068e7 travis: check symfony 3.0 2016-02-11 19:48:07 +01:00
Gregor Harlan 893c85c655 introduce "Bundle" namespace part 2016-02-11 19:31:44 +01:00
Gregor Harlan 4aa5244f67 update composer.json 2016-02-11 19:13:30 +01:00
Gregor Harlan 1d37d708c4 update travis.yml 2016-02-11 19:12:13 +01:00
Toni Uebernickel e0a35f0189 Merge pull request #381 from tacman/patch-1
add raw filter so sql is formatted
2016-01-08 16:40:40 +01:00
tacman df0e3991b6 add raw filter so sql is formatted
If autoescape is on, then the SQL HTML is displayed instead of formatted sql.  This will allow the Symfony debug toolbar to display formatted SQL regardless of the autoescape settings.

https://github.com/propelorm/PropelBundle/issues/380
2016-01-08 08:19:44 -05:00
Yunan NSNT 301df4331c check whether the value of defaultConnection have been set or not 2015-12-18 10:16:07 +07:00
Yunan NSNT 8d8cc7be79 set defaultConnection value for both runtime and generator if there is only one connection 2015-12-18 00:08:52 +07:00
Toni Uebernickel ead5be068e Merge pull request #355 from pimpreneil/fixtures_symfix
Fix #257 - Prevent symlink paths resolving in fixtures loading
2015-12-03 18:13:32 +01:00
Toni Uebernickel 754580d33d Merge pull request #351 from gharlan/resolve-deprecated-function-usages
Resolve deprecated function usages
2015-12-03 17:50:20 +01:00
Toni Uebernickel 9a048e8f01 Merge pull request #371 from Big-Shark/patch-4
Returned back Twig_SimpleFilter
2015-12-03 17:43:10 +01:00
Maxim 1a5db29384 Returned back Twig_SimpleFilter 2015-12-03 23:31:02 +07:00
Gregor Harlan 002d4d9f2f resolve deprecated function usages 2015-12-03 10:44:12 +01:00
Toni Uebernickel f9a87843f8 Merge pull request #367 from ktounet/2.0
Use "equals" function allows a better verification during validation of a cloned object
2015-12-03 07:33:03 +01:00
Toni Uebernickel 28842e3a8f Merge pull request #352 from ylazarov/patch-3
Update TranslationCollectionFormListener.php
2015-12-03 07:30:51 +01:00
Toni Uebernickel 28b15df850 Merge pull request #363 from lbarulski/patch-1
don't enforce semicolon at end of dsn
2015-12-03 07:30:08 +01:00
Toni Uebernickel 9b39fe926d Merge pull request #369 from Big-Shark/patch-2
Сhanged Twig filters for 3.0
2015-12-03 07:19:58 +01:00
Toni Uebernickel f4af63149a Merge pull request #370 from Big-Shark/patch-3
Added symfony 2.8 and removed php7 of allow_failures
2015-12-03 07:17:44 +01:00
Maxim 5a27d09993 Added symfony 2.8 and 3.0 and removed php7 of allow_failures 2015-12-03 10:27:22 +07:00
Maxim f112ebe271 Сhanged Twig filters for 3.0 2015-11-24 18:31:54 +07:00
Geoffrey Vincent 6aef05bf57 Use equals function to allow validation of a cloned object 2015-11-16 11:41:14 +01:00
Łukasz Barulski a730943db2 don't enforce semicolon at end of dsn
propel:database:create is not working if you have dbname at end of dsn without semicolon
2015-10-27 10:56:37 +01:00
Marc J. Schmidt ec464b1f8f Merge pull request #362 from mwaterboehr/patch-1
Update AbstractCommand.php
2015-10-22 13:36:08 +02:00
Toni Uebernickel b15aaa001d Merge pull request #360 from rayrigam/patch-2
Replace deprecated Twig_Filter_Method class
2015-10-22 11:44:07 +02:00
Micha Waterböhr 66c7e32838 Update AbstractCommand.php
fixed return value to return correct dsn with appended user and password values
2015-10-22 11:19:59 +02:00
rayrigam 5a0cc6770f Replace deprecated Twig_Filter_Method class
The Twig_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.
2015-09-25 15:29:55 -03:00
Marc J. Schmidt 47b17c4877 Merge pull request #357 from didipeut/fixtures-load-sql
fixed insertSql method for FixturesLoadCommand
2015-08-21 11:32:18 +02:00
Arnaud Lejosne 0ce540c84a Fix #257 - Prevent symlink paths resolving in fixtures loading 2015-08-13 13:28:21 +02:00
dietmar.erdmann 631cae6258 fixed insertSql method for FixturesLoadCommand
option sql-dir has to be the cacheDir, force is needed for
SqlInsertCommand
2015-08-11 18:07:24 +02:00
Toni Uebernickel 88bf864e25 Merge pull request #353 from gharlan/model-type-without-translation
Do not translate choices of model type
2015-08-10 18:40:02 +02:00
Gregor Harlan 32e2aa4ea8 do not translate choices of model type 2015-08-10 15:01:41 +02:00
Yordan Lazarov 468fab3c6f Update TranslationCollectionFormListener.php
Method hasParent() in FormType is deprecated and removed.
2015-08-09 15:03:17 +03:00
Marc J. Schmidt 0852bf835e log queries into own propel channel 2015-07-28 18:05:12 +02:00
Toni Uebernickel 099f7953a9 Merge pull request #347 from gharlan/symfony-versions
Travis: updated symfony and php versions
2015-07-28 10:36:56 +02:00
Gregor Harlan 012b79d19e Travis: updated symfony and php versions 2015-07-28 10:10:47 +02:00
Toni Uebernickel 429f6b5879 Merge pull request #332 from IceShack/2.0
Add user and password to dsn string
2015-07-22 08:30:19 +02:00
Marc J. Schmidt cf1aa6dc14 Merge pull request #345 from gharlan/data-loader
DataLoader: allow to set foreign key for a table not included in fixture
2015-07-15 20:08:39 +02:00
Gregor Harlan e80e31858d DataLoader: allow to set foreign key for a table not included in fixtures 2015-07-15 18:16:33 +02:00
Toni Uebernickel e729612866 Merge pull request #340 from Big-Shark/patch-1
Remove var_dump
2015-06-19 14:49:02 +02:00
Maxim 22cbcc5a98 Remove var_dump 2015-06-19 16:09:36 +07:00
Toni Uebernickel 1701a4e67d Merge pull request #309 from K-Phoen/infer-default-connection
Fix default connection detection when not explicitly set in the config
2015-06-10 20:56:30 +02:00
Toni Uebernickel e3903ffad3 Merge pull request #338 from gharlan/psr-4
Use PSR-4
2015-06-10 20:37:54 +02:00
Gregor Harlan 5a91ba24e0 Use PSR-4 2015-06-08 10:52:12 +02:00
Marc J. Schmidt e3398133b1 Merge pull request #336 from apinnecke/feature/stack-trace-in-debug-toolbar
Added stack trace to debug toolbar
2015-04-13 13:45:28 +02:00
Marc J. Schmidt 152d48ce7d Fix test suite by defining correct foreign key name 2015-04-13 12:43:37 +02:00
Alexander Pinnecke 2fc716467b Added stack trace to debug toolbar 2015-04-10 17:52:41 +02:00