1
0
mirror of synced 2025-01-09 18:47:10 +03:00
Commit Graph

8296 Commits

Author SHA1 Message Date
Kevin Brogan
5989c0cb54 removed erroneous tip
I'm working through the tutorial myself and got to this point.

Don’t forget to add a require_once call for this class to the bootstrap.php

This advice is wrong. The class is located in the src directory and so is autoloaded when required. No require statement is necessary.
2014-01-10 20:28:41 -08:00
Benjamin Eberlei
93c1106735 Merge pull request #901 from deeky666/disable-travis-hhvm-unsupported-drivers
Exclude HHVM + PostgreSQL and HHVM + Mysqli from travis build matrix
2014-01-08 11:22:29 -08:00
Steve Müller
f4c30dcd1c exclude unsupported HHVM + PostgreSQL and HHVM + Mysqli from travis build matrix for now 2014-01-08 20:19:10 +01:00
Guilherme Blanco
4e824ac6e1 Merge pull request #900 from deeky666/fix-connection-mock
Fix connection mock fetchColumn signature
2014-01-06 12:27:50 -08:00
Steve Müller
5f93c83059 fix connection mock fetchColumn signature 2014-01-06 21:24:01 +01:00
Guilherme Blanco
b65d9e6c83 Merge pull request #896 from holtkamp/patch-2
Ensure <cascade/> elements preceed <join-columns/>
2014-01-05 11:32:31 -08:00
Guilherme Blanco
7f30c31e98 Merge pull request #897 from holtkamp/patch-3
Respected 'inheritanceType' at Entity level
2014-01-05 11:31:25 -08:00
Menno Holtkamp
fc2b9980ae Exclude exporting inheritanceType for INHERITANCE_TYPE_NONE 2014-01-05 18:53:31 +01:00
Menno Holtkamp
797fb9c34a Respected 'inheritanceType' at Entity level
It was (incorrectly) fetched from Table-level.
http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/annotations-reference.html#annref-inheritancetype
2014-01-05 18:41:55 +01:00
Menno Holtkamp
85a16f9f28 Ensure <cascade/> elements preceed <join-columns/>
When converting annotations based metadata to XML, the position of the <cascade/> elements resulted in XSD validation errors caused by the definitions of the association ComplexTypes:
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L463
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L482
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L495
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L517

Since changing the XSD might result in validation problems in existing mappings, changing the XmlExporter seems a better approach.

Note that the '<cache/>' element is not yet generated by the XmlExporter, but according to the XML Schema, it should precede the '<cascade/>' element.
2014-01-05 15:34:59 +01:00
Benjamin Eberlei
69cad4079d Merge pull request #820 from apancutt/master
Added support for field options to FieldBuilder
2014-01-03 14:03:25 -08:00
Benjamin Eberlei
8de37de4f7 Merge branch 'DDC-2792' 2014-01-03 23:01:12 +01:00
Benjamin Eberlei
2a9351b8dc [DDC-2792] Fix fatals 2014-01-03 23:01:05 +01:00
Vyacheslav Ganzin
1edf6b65b1 joinColumn is not required in manyToMany
annotation behavior copied
2014-01-03 22:27:27 +01:00
Benjamin Eberlei
c8c7cf0528 Fix tests after merge of QueryBuilder#addCriteria changes. 2014-01-03 21:28:06 +01:00
Steve Müller
5828e4c67c Merge pull request #894 from piotrantosik/patch-2
Fix typos - QueryBuilder
2014-01-03 09:23:48 -08:00
Piotr Antosik
eb45690e10 Fix typos - QueryBuilder 2014-01-03 17:28:42 +01:00
Adam Pancutt
352f5394e5 Removed FieldBuilder::unsigned() method as it is only supported by MySQL 2014-01-03 09:48:38 +00:00
Benjamin Eberlei
9a3cf77919 [DDC-2128] Fix PR according to comments. 2014-01-03 00:15:14 +01:00
catalin
93c018668d checking preg result. Should I raise an error
throw new ORMException("Error regular expression: " . $filter);
2014-01-03 00:15:14 +01:00
catalin
0d8f572661 added space after type cast (I could not find any rule in psr1/2 standard, but I modified in PhpStorm) 2014-01-03 00:15:14 +01:00
catalin
2326033e79 added preg_quote to $filter input 2014-01-03 00:15:13 +01:00
catalin
57e7559c1b - Applied Phpstorm PSR format
- Changed RegExp format
2014-01-03 00:15:13 +01:00
Catalinux
6963bf6028 Now MetaDataFilter takess also regexp. For example whern you want to
extract metadata if you would filter like this: --filter="Article"
would extract also for "ArticleItems" (article_items table). Now you
can use --filter="Article$" if you want only that table (articl)
2014-01-03 00:15:13 +01:00
Benjamin Eberlei
8118dddc6a Merge pull request #674 from TorbenBr/master
Shortcut for force
2014-01-02 15:02:46 -08:00
Benjamin Eberlei
0a2b5b8efd Merge pull request #734 from caponica/patch-1
Cleaned up documentation
2014-01-02 15:00:11 -08:00
Benjamin Eberlei
22d4d2e812 Merge branch 'DDC-2700' 2014-01-02 23:50:21 +01:00
Benjamin Eberlei
53ed898684 [DDC-2700] Add test and fix CS. 2014-01-02 23:50:15 +01:00
Benjamin Eberlei
2feffe164a Merge branch 'DDC-2732' 2014-01-02 23:33:56 +01:00
Benjamin Eberlei
b1e031a1b4 [DDC-2732] Add tests for XML id options fix. 2014-01-02 23:33:49 +01:00
Benjamin Eberlei
96ec3c1613 Merge pull request #830 from sandermarechal/sort-alias
[DDC-2764] Prefix criteria orderBy with rootAlias
2014-01-02 14:15:01 -08:00
Benjamin Eberlei
41581847b2 Merge pull request #833 from ronanguilloux/patch-console-entity-generator
Generate-Entities-Console-Command: Adding an 'avoid backup' flag
2014-01-02 14:13:27 -08:00
Benjamin Eberlei
e91ed74b25 [DDC-2775] cleanup test. 2014-01-02 23:11:35 +01:00
Benjamin Eberlei
17809abd29 Merge pull request #837 from mnapoli/DDC2775
DDC-2775 Tests and fix
2014-01-02 14:07:14 -08:00
Benjamin Eberlei
05576d3e1c Merge pull request #844 from terite/orm-validate-skip
Teach orm:validate-schema to --skip-mapping and --skip-sync
2014-01-02 14:00:22 -08:00
Benjamin Eberlei
ea84cfbdd1 Merge pull request #845 from flack/avoid-update-on-delete
Don't compute changeset for entities that are going to be deleted
2014-01-02 13:59:25 -08:00
Benjamin Eberlei
10576286b8 [DDC-2803] Fix error in documentation. 2014-01-02 22:54:46 +01:00
Benjamin Eberlei
7a4a46a95c [GH-855] fix CS 2014-01-02 22:50:36 +01:00
ptarjan
27c9074b71 don't rely on gc_collect_cycles for HHVM 2014-01-02 22:50:36 +01:00
Benjamin Eberlei
3a8aaea14a Merge pull request #794 from stefankleff/patch-1
Multiple invokation of listeners on PreFlush event
2014-01-02 13:16:21 -08:00
Benjamin Eberlei
a2cdc7a1c7 Merge pull request #893 from yktd26/master
autoGenerate arg from bool to int
2014-01-02 13:03:33 -08:00
yktd26
c9e06a6854 Format code 2013-12-31 12:25:14 +01:00
yktd26
bee74f898d autoGenerate arg from bool to int
For using all four modes of proxies generation, change the 4th arg of
ProxyFactory's constructor to integer
2013-12-31 11:58:36 +01:00
Guilherme Blanco
a7b9140d2f Merge pull request #890 from deeky666/DBAL-563
[DBAL-563] Add general IDENTITY generator type support for sequence emulating platforms
2013-12-30 21:34:20 -08:00
Benjamin Eberlei
58c57c50bf Merge pull request #891 from spolischook/patch-2
Allow to not generate extra use
2013-12-30 00:33:03 -08:00
Sergey Polischook
07f67c5d1a Allow to not generate extra use
For case when we not generate annotation (by default at doctrine orm:generate-entities) allow to not generate extra use for it - 
```php
use Doctrine\ORM\Mapping as ORM;
```
For example if generate entities for my project that use only dbal in pord but use orm for generate entities in dev mode.
2013-12-30 04:43:35 +02:00
Steve Müller
337857dc8a add general IDENTITY generator type support for sequence emulating platforms 2013-12-29 05:55:16 +01:00
Marco Pivetta
7360231b4b Merge pull request #888 from entering/docs-yaml-mapping-improve-example
Add an example to doc of YAML mapping
2013-12-25 14:12:38 -08:00
entering
2f0b4a5d81 Add an example to doc of YAML mapping 2013-12-25 22:11:15 +00:00
Matthieu Napoli
c9791fe97f Inlined the model for the DCC2775 test case inside the test class 2013-12-23 09:55:10 +01:00