RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-10 11:07:10 +03:00
Code Issues Projects Releases Wiki Activity
8,754 Commits 5 Branches 0 Tags 32 MiB
b31ba98076
Commit Graph

8754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benjamin Eberlei
0621b5a161 Merge branch 'DDC-3045' 2014-03-23 09:58:38 +01:00
Benjamin Eberlei
c8836a008d [DDC-3045] Check that EntityRepository APIs prevent SQL injection through field names. Improve EntityManager#find() error handling when invalid identifier fields are passed. 2014-03-23 09:58:31 +01:00
Menno Holtkamp
6e651b13c9 Added test to ensure boolean metadata is properly exported/serialized to XML 2014-03-20 21:29:52 +01:00
Guilherme Blanco
fdb9f90848 Merge pull request #983 from holtkamp/patch-new-dql-in-expression-builder 
Added MEMBER OF and INSTANCE OF to ExpressionBuilder
 2014-03-20 08:28:32 -05:00
Menno Holtkamp
ef4e73f987 Use boolean values for 'unique' attribute 
As defined in: https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L294

Same as 'nullable' attribute. 

It was being exported as a "1" for TRUE and "0" for false
 2014-03-20 11:08:29 +01:00
Menno Holtkamp
262e465e39 Processed code-review feedback 2014-03-20 09:02:39 +01:00
Menno Holtkamp
56e879b7aa Removed double linebreaks 2014-03-19 13:03:26 +01:00
Menno Holtkamp
400f420925 Added MEMBER OF and INSTANCE OF helpers to ExpressionBuilder 2014-03-19 13:00:45 +01:00
Thomas Lallement
6bbc07ddbf Update DDC3033Test.php 2014-03-18 22:10:15 +01:00
Thomas Lallement
7bf2bcb017 Update DDC3033Test.php 2014-03-18 15:04:48 +01:00
Thomas Lallement
263822fd19 Failing Test (since commit 53a5a48aed) 
Hi,

It seems to be a regression since the commit 53a5a48aed

Doctrine\ORM\PersistentCollection can be populated in $changeSet if you set a PreUpdate and PostUpdate event.

Original issue: http://www.doctrine-project.org/jira/browse/DDC-3033
 2014-03-18 15:00:43 +01:00
Marco Pivetta
9b4ae6d556 Removing note on m2m association filtering as of #885 2014-03-16 17:41:19 +01:00
Guilherme Blanco
383604d4b8 Merge pull request #978 from AntonStoeckl/embedded-empty-prefix 
[DDC-2987] Enable empty prefixes for inlined embeddable
 2014-03-16 11:35:25 -05:00
Guilherme Blanco
44c1dae1b9 Merge pull request #885 from bakura10/criteria-many-to-many 
Add support for ManyToMany Criteria
 2014-03-16 11:33:10 -05:00
Adrian Olek
49587776fa Renamed _exportOptions method 2014-03-16 17:31:15 +01:00
Adrian Olek
e403bf207c cs fix 2014-03-16 16:56:46 +01:00
Adrian Olek
553883bdd1 Added options attribute export to Annotation, Xml & Yaml 
exporters.
 2014-03-16 16:50:41 +01:00
Anton Stoeckl
83ef47c8d0 This fixes ticket DDC-3028 
Enables columnPrefix to be "false" so no prefix is added.
Changed the structure a bit (to if/else) to be more readable with the additional condition.
 2014-03-14 12:34:22 +01:00
Anton Stoeckl
871dc5d186 Test are for fix of ticket DDC-3028 
Added 3 tests that check regression for:
- columnPrefix is empty
- columnPrefix is a string
- columnPrefix is false

Added some small entity / embeddable classes to support the test cases.
 2014-03-14 12:32:49 +01:00
Anton Stoeckl
cd2043915c columnPrefix must support string and boolean, so changing to mixed 2014-03-14 12:29:01 +01:00
Anton Stöckl
fa79de6ea4 Enable empty prefixes for inlined embeddable 
This fixes http://www.doctrine-project.org/jira/browse/DDC-2987

This makes it possible to map a field from an embeddable to a database field with the same name, without any prefix added.

Example:
- an embeddable object "Id" with a property "id"
- per default this would map inline to id_id
- supplying null or '' as columnPrefix does not work due to the ! empty() check
- with my little change, if columnPrefix : false is supplied in the mapping config this will now map to a db column "id"

To build Ids as ValueObjects is a very common approach in DDD, so ihmo this is a must have.
 2014-03-13 16:47:22 +01:00
Marco Pivetta
b30b1a5999 Merge pull request #977 from mvrhov/patch-2 
Fix wrong annotation
 2014-03-11 14:52:49 +01:00
Miha Vrhovnik
d888d7d1c0 Fix wrong annotation 
Without above fix I'm getting 
"[Semantical Error] The annotation "@array" in method Doctrine\ORM\Mapping\ClassMetadataInfo::mapEmbedded() was never imported. Did you maybe forget to add a "use" statement for this annotation?"
 2014-03-11 14:44:42 +01:00
Marco Pivetta
02daf0049a Merge branch 'docs/DDC-3020' 2014-03-11 11:30:18 +01:00
Marco Pivetta
fea200043e Adding note about DDC-3020 - external XML entities may or may not work 2014-03-11 11:30:08 +01:00
Marco Pivetta
87505c8716 Merge pull request #975 from tkleinhakisa/doc-automatic-discriminator-map 
Added info about automatic discriminator map
 2014-03-11 10:08:58 +01:00
Klein Thomas
832127a0d6 Added info about automatic discriminator map 
see https://github.com/doctrine/doctrine2/blob/master/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php#L257
 2014-03-11 09:54:46 +01:00
Guilherme Blanco
f197a9c9f1 Merge pull request #974 from FabioBatSilva/resolve-association-entry 
[SLC] Resolve association cache entry
 2014-03-06 22:38:26 -05:00
Fabio B. Silva
e9ec0a24da [SLC] resolve association cache entry 2014-03-06 20:44:59 -05:00
Fabio B. Silva
ecf242f6d4 Merge pull request #971 from FabioBatSilva/slc-query-assoc-proxy 
[SLC] Fix query association proxy
 2014-03-06 15:43:58 -05:00
Marco Pivetta
8d4821b4dc Merge pull request #972 from hallabro/patch-1 
Capitalize @GeneratedValue (annotations-reference.rst)
 2014-03-05 11:03:30 +01:00
Marco Pivetta
7843eed8bc Merge pull request #969 from aitboudad/patch-2 
[Doc] added note about Criteria limits on PersistentCollection
 2014-03-05 10:59:10 +01:00
Robin Hallabro
a395921fdc Capitalize @GeneratedValue (annotations-reference.rst) 2014-03-05 10:57:31 +01:00
Fabio B. Silva
cbdd8bc041 [SLC] Fix query association proxy 2014-03-05 04:10:07 -05:00
Abdellatif AitBoudad
5f429a5418 [Doc] added note Criteria limits. 2014-03-04 21:36:07 +00:00
Guilherme Blanco
15432fc55f Merge pull request #967 from FabioBatSilva/slc-query-builder 
[SLC] Add query builder options
 2014-03-03 21:10:48 -05:00
fabios
6e64cc101a [SLC] Add query builder options 2014-03-03 15:28:35 -05:00
Benjamin Eberlei
63d849b6f0 Merge pull request #966 from FabioBatSilva/simplify-build 
Simplify build matrix
 2014-03-02 12:36:50 +01:00
Fabio B. Silva
a91e05db9e Simplify build matrix 2014-03-01 17:13:28 -05:00
Benjamin Eberlei
a522aa0a81 Merge pull request #965 from FabioBatSilva/slc-criteria 
[SLC] Add support for criteria
 2014-03-01 12:47:57 +01:00
Benjamin Eberlei
f0a6eb8723 Merge pull request #964 from FabioBatSilva/DDC-2943 
[SLC][DDC-2943] Disable slc for pagination queries
 2014-03-01 12:46:52 +01:00
Fabio B. Silva
8c2aef3f14 [DDC-2943] Disable slc for pagination queries 2014-03-01 01:15:09 -05:00
Fabio B. Silva
f4c63f8238 [SLC] Support criteria 2014-03-01 00:59:34 -05:00
Miro Demovic
1921c2f74a Allow if parameter exists in SQLFilter 2014-02-26 08:55:47 +01:00
Zacharias Luiten
8a168bb2ce stop executing executeDeletions when there is nothing to to delete anymore 2014-02-25 16:02:02 +01:00
Alexandru Patranescu
1fe6dbc1f2 allow passing EntityManagerInterface when creating a HelperSet 2014-02-23 20:01:14 +02:00
Benjamin Eberlei
f5897d4b0b Merge branch 'master' of github.com:doctrine/doctrine2 2014-02-21 16:14:57 +01:00
Benjamin Eberlei
51e5db86b7 Add SECURITY.md and a chapter on security assumptions in Doctrine ORM. 2014-02-21 16:12:32 +01:00
Eugene Kuzmenko
c06201303d makes doctrine less dependent upon the symfony yamp component 2014-02-20 09:28:44 +00:00
Marco Pivetta
dfe7a68053 Removing notice about public properties support (included since 2.4) 
see doctrine/doctrine2#406
 2014-02-19 22:02:07 +01:00