RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-31 20:41:44 +03:00
Code Issues Projects Releases Wiki Activity
9,674 Commits 5 Branches 0 Tags
Commit Graph

9674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josef Kříž
d1a695b42b Typo in phpdoc 2015-03-23 15:57:41 +01:00
Guilherme Blanco
e6887954ec Merge pull request #1344 from zeroedin-bill/fix-slc-tests-console-decoration 
Fix tests for SLC console commands failing due to console output decoration
 2015-03-20 13:52:00 -04:00
Bill Schaller
b057b64c1c Fix tests for SLC console commands failing due to comparison with decorated console output. 2015-03-20 13:45:49 -04:00
Marco Pivetta
24425436b0 Bumping version constants to 2.5.0-DEV 2015-03-18 22:38:42 +00:00
Marco Pivetta
483d48cc54 Bumping version constants for the 2.5.0-BETA1 release 2015-03-18 22:38:18 +00:00
Marco Pivetta
05db65d034 Merge pull request #1341 from javiereguiluz/patch-6 
[doc] Minor fixes and typos
 2015-03-18 22:02:15 +00:00
Javier Eguiluz
be18915ed6 Minor fixes and typos 2015-03-18 17:27:31 +01:00
Benjamin Eberlei
b3a6fb7fde [DDC-3461] Renamed AssocationBuilder::isPrimaryKey() to makePrimaryKey(). Same for FieldBuilder and depreceating isPrimaryKey(). Adjust tests. Revert change in ClassMetadataInfo and fix bug. 2015-03-18 17:06:30 +01:00
Marco Pivetta
df8be6f31e Correcting import that was colliding with another already imported User type 2015-03-17 23:58:53 +00:00
Marco Pivetta
4daf383e4f Merge pull request #1303 from mrkrstphr/querybuilder-get-all-aliases 
make QueryBuilder::getAllAliases public
 2015-03-17 23:33:43 +00:00
Marco Pivetta
3b0fb6b4b8 Merge pull request #1274 from doctrine/persistent-collection-as-lazy-collection 
PersistentCollection now extends AbstractLazyCollection.
 2015-03-17 23:32:17 +00:00
Marco Pivetta
1add0a04fa Merge pull request #1302 from goetas/pr1301 
Store column values of not cache-able associations
 2015-03-17 23:27:04 +00:00
Marco Pivetta
0738571b7d Merge branch 'feature/#1316-allow-non-public-schema-join-tables' 
Close #1316
 2015-03-17 23:16:26 +00:00
Marco Pivetta
648fde8914 #1316 - removing useless null check (redundant with isset()), cs cleanups 2015-03-17 23:16:16 +00:00
Marco Pivetta
4095bbaa92 #1316 - adding @group annotation to newly introduced tests 2015-03-17 23:15:07 +00:00
Marco Pivetta
0c0d3a1a7c #1316 - removing unused API from stub class 2015-03-17 23:14:29 +00:00
Marco Pivetta
bfd628e153 #1316 - refactoring test code to reduce the number of actual involved systems (quote strategy) 2015-03-17 23:14:13 +00:00
molchanoviv
ab740abe96 Add DefaultQuoteStrategyTest::testGetJoinTableName() test 2015-03-17 23:03:03 +00:00
molchanoviv
f244db80fb Allow to join non-public schema tables 2015-03-17 23:03:03 +00:00
Marco Pivetta
8f0b3398d3 Merge branch 'hotfix/#1327-entity-generator-default-property-value-export' 
Close #1327
 2015-03-17 22:47:50 +00:00
Jeremy
ac9a5e69ec Properly generate default value from yml & xml mapping 2015-03-17 22:47:11 +00:00
Marco Pivetta
ce41e35c1f Merge branch 'hotfix/#1338-identity-map-garbage-collection-prevention-on-canceled-remove' 
Close #1338
 2015-03-17 22:38:19 +00:00
Marco Pivetta
0a2d9fa130 #1338 - Removing redundant test case 2015-03-17 22:36:00 +00:00
Marco Pivetta
504552e779 Adding @group annotations for newly introduced tests 2015-03-17 22:31:05 +00:00
Marco Pivetta
b721841c73 #1338 DDC-3619 - moved test to unit of work tests 2015-03-17 22:30:06 +00:00
nclavaud
b492d61398 Update identityMap when entity gets managed again 
http://www.doctrine-project.org/jira/browse/DDC-3619

When using SoftDeleteable doctrine extension, an entity can be scheduled
for deletion, then persisted before flushing. In such a case, the entity
was removed from the unit of work identity map and no reference was
hold. This could lead to spl_object_hash collisions, and prevent
another, new entity to be persisted later.

This fix makes sure the unit of work identity map holds a reference to
the entity after it has been soft-deleted.
 2015-03-17 22:19:10 +00:00
Marco Pivetta
da72f3e62c Merge branch 'hotfix/#1336-handle-custom-object-type-identifiers-in-uow' 
Close #1336
 2015-03-17 21:31:03 +00:00
Marco Pivetta
5c89bb8c6b #1336 DDC-3622 - removing implicit cast from string to CustomIdObject in entity API (confusing) 2015-03-17 21:29:30 +00:00
Marco Pivetta
712b6a7a64 #1336 DDC-3622 - adding @group annotations for newly introduced tests 2015-03-17 21:23:16 +00:00
Marco Pivetta
11da060668 #1336 - class constants over string references in tests - removing useless QueryBuilder usage 2015-03-17 21:21:20 +00:00
Marco Pivetta
40c41857e8 #1333 - Removing unused is_string() function call and cast (always a string) 2015-03-17 21:12:20 +00:00
Marco Pivetta
d6687e070e #1333 - Removing useless is_string() function call, clarifying docblock parameters 2015-03-17 21:11:43 +00:00
Stefano Torresi
5d6a39d14c fix tests tear down 2015-03-17 21:08:07 +00:00
Stefano Torresi
904bcfa4f9 add docs notice about custom object types as IDs 2015-03-17 21:08:07 +00:00
Stefano Torresi
c7ad932b5f fix copyright notices 2015-03-17 21:08:07 +00:00
Stefano Torresi
1b850fbb23 add missing return statement 2015-03-17 21:08:07 +00:00
Stefano Torresi
2bdc1142fe add string casting to id hashes 2015-03-17 21:08:06 +00:00
Stefano Torresi
41e873bd72 add failing functional test for custom id object types 2015-03-17 21:08:06 +00:00
Marco Pivetta
32137c72e4 Merge branch 'hotfix/#1333-datetime-immutable-dql-parameter-inference' 
Close #1333
 2015-03-17 21:01:05 +00:00
Marco Pivetta
376e74fb7e #1333 - minor CS fixes - spacing/PSR-2 2015-03-17 20:59:56 +00:00
Jan Langer
8ac66bb608 Allow DateTimeInterface as parameter value 2015-03-17 20:58:20 +00:00
Marco Pivetta
2fb11cdf05 Merge pull request #1335 from BenMorel/queryreturntype 
Fix AbstractQuery::getParameter() documented return type
 2015-03-17 14:58:21 +00:00
Benjamin Morel
8d7ba1aebb Fixed AbstractQuery::getParameter() documented return type 2015-03-17 15:53:09 +01:00
Marco Pivetta
89ab4b3f48 Merge pull request #1334 from acrobat/internal-phpdoc-fix 
Changed some wrong usage of the @internal phpdoc
 2015-03-15 19:08:02 +01:00
Jeroen Thora
a409e7591d Changed some wrong usage of the @internal phpdoc 2015-03-15 16:53:34 +01:00
Marco Pivetta
6cf76158a0 Merge pull request #1329 from Wilt/patch-1 
Fix for inconsistent use of getSQLDeclaration
 2015-03-13 17:44:40 +01:00
Marco Pivetta
d87118437e Merge pull request #1330 from coolmic/patch-1 
Fix @Column options sections in documentation
 2015-03-12 22:16:28 +01:00
Marco Pivetta
cdc739b7f8 Merge pull request #1331 from 1ed/patch-2 
[DOCS] Fixed class name in aggregate fields example
 2015-03-12 22:14:38 +01:00
Gábor Egyed
6a75bf078b [DOCS] Fixed class name in aggregate fields example 2015-03-12 19:27:54 +01:00
Coolmic
f2d8b6d762 Fix @Column options sections 
I lose hours to find out how to make column collation works, mostly because of incorrect docs.

Annotations options is the equivalent of customSchemaOptions in https://github.com/doctrine/dbal/blob/master/docs/en/reference/schema-representation.rst

See d1e5034659/lib/Doctrine/ORM/Tools/SchemaTool.php (L443)
 2015-03-12 12:22:59 +01:00