Commit graph

552 commits

Author SHA1 Message Date
William DURAND
6620406a84 Fixed error message 0.6 2012-04-20 02:27:47 +02:00
William DURAND
a30747ed09 Added a better way to use a bundle argument in commands
Added bundle argument to propel:model:build command
2012-04-20 02:20:54 +02:00
William DURAND
cb9d7908d8 Merge branch '2.0' 2012-04-17 15:10:30 +02:00
William Durand
c032f468b3 Merge pull request #134 from mrbase/backport-slaves-configuration
Backport slaves configuration
2012-04-17 06:01:20 -07:00
ulrik nielsen
04d607bbf8 updated docs 2012-04-17 14:56:17 +02:00
ulrik nielsen
97dbf813dd slaves should only be added as child of a master connection 2012-04-17 14:25:13 +02:00
ulrik nielsen
0507a57277 Avoid error when no slave database configuration are given + adding case in the test 2012-04-17 12:12:23 +02:00
Joel Wurtz
6fe154ab94 Add slaves configuration for propel in config.yml 2012-04-17 12:10:43 +02:00
William DURAND
550d8e3aa6 Updated FormType skeleton to reflect last Symfony2 changes 2012-04-16 11:30:24 +02:00
William DURAND
f68972f2b7 Fixed PropelGeneratorAwareCommand to use the propel.ini file 2012-04-16 11:14:55 +02:00
William DURAND
d3205f13ab [FormGenerateCommand] Added a way to specify which Form Type to generate 2012-04-11 13:57:11 +02:00
William DURAND
0b85aba836 [Command] Added a new command named: propel:form:generate
Allows to quickly create Form Type stubs
Added a PropelGeneratorAwareCommand class (abstract) to write more code generation based commands
Added few tests, fixed some tests as well
2012-04-11 12:00:19 +02:00
William DURAND
6a22291eba [WIP] Introduced form:generate command 2012-04-11 00:41:14 +02:00
William DURAND
87032e2277 Merge pull request #132 from afjlambert/patch-1 0.5
Update Command/BuildCommand.php
2012-04-08 15:45:35 -07:00
Andre Lambert
b4f554a19e Update Command/BuildCommand.php 2012-04-09 01:32:59 +03:00
William DURAND
07f7ec73c5 [Command] Refactored some commands. 2012-04-07 21:58:45 +02:00
William DURAND
69848973f4 Handled Composer install to avoid the defintion of Propel/Phing paths 2012-04-07 21:16:33 +02:00
William DURAND
712d0792e2 Added Propel version to the profiler panel 2012-04-07 21:15:45 +02:00
William DURAND
b890706c4e Merge branch '2.0' 0.4
Conflicts:
	Tests/DataFixtures/Dumper/YamlDataDumperTest.php
	Tests/DataFixtures/Loader/YamlDataLoaderTest.php
2012-04-06 12:57:52 +02:00
William DURAND
ab44842af1 Updated documentation 2012-04-06 12:49:29 +02:00
William DURAND
cfb7873719 Merge pull request #130 from Palleas/load_from_bundle
Add a way to load fixtures from a specific bundle
2012-04-06 03:36:39 -07:00
Romain Pouclet
0f78f2b875 Avoid duplicating fixtures path 2012-04-06 12:04:43 +02:00
Romain Pouclet
234f874622 Remove blank line 2012-04-06 11:56:12 +02:00
Romain Pouclet
994f599fe0 Use FileLocator 2012-04-06 11:30:32 +02:00
William DURAND
e34f2a0dcd Merge pull request #131 from hhamon/acl_entry_fix
[Model] [Acl] removed useless else clause in Entry::toAclEntry().
2012-04-06 02:19:15 -07:00
Romain Pouclet
41e147ba8e Change 'getFileLocator' method's visibility to protected as it's needed in the FixtureLoadCommand class 2012-04-06 10:58:12 +02:00
Hugo Hamon
070ba6ba50 [Model] [Acl] removed useless else clause in Entry::toAclEntry(). 2012-04-06 10:24:20 +02:00
William DURAND
412a3cfa9e Fixed propel version in composer.json 2012-04-05 09:38:10 +02:00
William DURAND
7407845bb6 Improved the composer file 2012-04-05 09:22:36 +02:00
Romain Pouclet
b28c863915 Add a way to load fixtures from a specific bundle 2012-04-04 23:28:06 +02:00
William DURAND
e15eccc0cd Merge pull request #129 from cedriclombardot/feat-explain
Allow to show explain plans on each queries
2012-03-26 01:42:48 -07:00
clombardot
295f732279 Add an achor to return at the good query running explain 2012-03-19 09:52:02 +01:00
clombardot
f114112c99 Fix phpdoc 2012-03-19 09:45:20 +01:00
clombardot
7188e19536 Allow to show explain plans on each queries 2012-03-16 12:32:50 +01:00
Toni Uebernickel
e0d2b9f43a Merge pull request #128 from havvg/2.0
backport of DataFixtures fix by removed CLASS_DEFAULT
2012-03-14 02:53:03 -07:00
Toni Uebernickel
9491c1b27c backport f589d31 from master 2012-03-14 10:16:09 +01:00
Toni Uebernickel
01bd79c3b5 Merge pull request #126 from lucasaba/typo-fix-AbstractPropelCommand
Typo fix in AbstractPropelCommand
2012-03-12 14:37:54 -07:00
Luca Saba
77d338f39b Correct a typo in a comment in AbstractPropelCommand 2012-03-12 22:05:09 +01:00
William DURAND
4754feac83 Merge pull request #123 from havvg/master
fix data collector template
2012-03-08 15:24:56 -08:00
Toni Uebernickel
8d78b9fb8a fix data collector template 2012-03-09 00:10:56 +01:00
William DURAND
eff307d116 Merge pull request #120 from jeremyFreeAgent/evo_displayTimeFromCollector
Added display of time of all queries in collector
2012-03-07 14:17:10 -08:00
William DURAND
5df56d434d Merge pull request #121 from jaugustin/patch-2
Add phing_path directly to include path to make it work with composer and pear package
2012-03-07 08:46:33 -08:00
Jérémie Augustin
b7b5592a60 Add phing_path directly to includ path to make it work with composer and pear package 2012-03-07 15:47:57 +01:00
Jérémy Romey
b75b7a5fbb Added display of time of all queries in collector 2012-03-07 10:48:38 +01:00
William DURAND
49598d1aa9 Merge pull request #114 from havvg/feature/dataloader-self-reference
allow self reference in DataLoader
2012-03-05 12:38:41 -08:00
Toni Uebernickel
ca68ea6c79 allow self reference in DataLoader
A self referencing entry will trigger an "UPDATE" rather than another "INSERT" with the new data.
2012-03-05 15:51:02 +01:00
William DURAND
d8f2fc582c Merge pull request #118 from havvg/feature/testing-dataloader
add m:n test for data loader
2012-03-05 06:27:03 -08:00
Toni Uebernickel
eece448443 add m:n test for data loader
* refactor tests of DataFixtures
2012-03-05 15:00:48 +01:00
William DURAND
e87c020313 Merge pull request #117 from havvg/feature/testing-dataloader
add tests for DataFixtures
2012-03-05 04:02:54 -08:00
Toni Uebernickel
f589d318ee add tests for DataFixtures 2012-03-05 12:31:32 +01:00