RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity
8,170 Commits 5 Branches 0 Tags 32 MiB
final-keyword-fix
Commit Graph

8170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilyas Salikhov
b85d004440 Remove final keyword from Query classes 2015-06-14 13:16:01 +03:00
Marco Pivetta
0cf7e0e628 Merge branch 'hotfix/#1352-entity-generator-new-class-metadata-hotfix-2.4' into 2.4 
Close #1352
 2015-03-31 08:45:37 +01:00
Fedik
2290d1ff9b fix EntityGenerator RegenerateEntityIfExists 2015-03-31 08:45:07 +01:00
Jonathan H. Wage
ecb1e1060a Update docs theme submodule. 2015-03-23 22:22:04 +00:00
Marco Pivetta
9dfa20d3af Merge branch 'hotfix/#1327-entity-generator-default-property-value-export-2.4' into 2.4 2015-03-17 22:48:41 +00:00
Jeremy
33baa41e9f Properly generate default value from yml & xml mapping 2015-03-17 22:48:23 +00:00
Marco Pivetta
1c8f9ca1cc Merge branch 'hotfix/#1338-identity-map-garbage-collection-prevention-on-canceled-remove-2.4' into 2.4 2015-03-17 22:42:48 +00:00
Marco Pivetta
7aa33c6a15 #1338 - Removing redundant test case 2015-03-17 22:41:52 +00:00
Marco Pivetta
0fc476d068 Adding @group annotations for newly introduced tests 2015-03-17 22:41:42 +00:00
Marco Pivetta
1e38d7d07e #1338 DDC-3619 - moved test to unit of work tests 2015-03-17 22:40:21 +00:00
nclavaud
bac6570af1 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:38:57 +00:00
Marco Pivetta
18c873216b Merge pull request #1300 from Ocramius/hotfix/#1169-DDC-3343-one-to-many-persister-deletes-only-on-extra-lazy-plus-orphan-removal-2.4 
[2.4] #1169 DDC-3343 one-to-omany persister deletes only on EXTRA_LAZY plus orphanRemoval
 2015-02-16 00:29:00 +00:00
Marco Pivetta
11936a6cac #1169 DDC-3343 - correcting functional test case cleanup logic (sorting deletes by FK dependencies) 2015-02-05 00:53:34 +00:00
Marco Pivetta
f5705d6d95 #1169 DDC-3343 - corrected persister logic - only uses the entity persister to perform deletes on the owning side 2015-02-05 00:52:54 +00:00
Marco Pivetta
a1bd3e8cc9 #1169 DDC-3343 - optimized imports 2015-02-05 00:25:20 +00:00
Marco Pivetta
2fa48c6e88 #1169 DDC-3343 - actually deleting associated elements when they are orphaned and EXTRA_LAZY is used 2015-02-05 00:25:06 +00:00
Marco Pivetta
c4ab4db743 #1169 DDC-3343 - remove duplicate tests introduced by cherry-picking conflicts 2015-02-05 00:23:51 +00:00
Marco Pivetta
c6e7a81849 #1169 DDC-3343 - removing duplicate test method 2015-02-05 00:21:28 +00:00
Marco Pivetta
4bed15b984 #1169 DDC-3343 - one-to-many persister should only interact with the data when orphanRemoval and EXTRA_LAZY are combined 2015-02-05 00:20:39 +00:00
Marco Pivetta
4884183b95 #1169 DDC-3343 - fixing test case typos (referencing wrong/inexisting properties, inexisting owning side assigned 2015-02-05 00:16:58 +00:00
Marco Pivetta
fac410b213 #1169 DDC-3343 - aligning test suite logic to the 2.5 branch (failing tests) 2015-02-05 00:16:07 +00:00
Marco Pivetta
cbe5575f38 #1169 DDC-3343 - adding tests for orphan-removal + extra-lazy + one-to-many element removal behavior 2015-02-05 00:15:18 +00:00
Marco Pivetta
94c0e46c96 #1169 DDC-3343 - updating test expectations - one-to-many changes should be no-op unless orphan removal is specified. 2015-02-05 00:14:19 +00:00
Marco Pivetta
af59ea962f #1169 DDC-3343 - updating test expectations - one-to-many changes should be no-op unless orphan removal is specified. 2015-02-05 00:14:11 +00:00
Marco Pivetta
e05930e714 Merge branch 'hotfix/#1294-avoid-connection-with-detached-metadata-backport-to-2.4' into 2.4 2015-02-04 23:46:22 +00:00
Marco Pivetta
db06355b63 #1294 - fixing differences between 2.5 and 2.4 fixes (reverts DBAL dependency bump) 2015-02-04 23:46:15 +00:00
Ryan Weaver
2e9ffe831c Adding docblock 2015-02-04 23:37:11 +00:00
Ryan Weaver
9d7256aace Small code change thanks to the comments and adding a test 2015-02-04 23:37:03 +00:00
Ryan Weaver
52b3e21969 Only getting the target platform when it's *actually* needed to avoid errors 
initialize() is called sometimes, even when the following code doesn't need
the targetPlatform property. Specifically, in AbstractClassMetadataFactory::getAllMetadata().

But as of DBAL 2.5.0, calling Connection::getDatabasePlatform() will make a
connection to the database, which means that sometimes it may fail (e.g. you
haven't configured your database yet). As a result, calling a method like
AbstractClassMetadataFactory::getAllMetadata() - which does not need the
targetPlatform - will fail, because determining the targetPlatform requires
a connection, which fails.

This avoids that - we only get the targetPlatform *when* we need it, which
are cases where we're doing things that do indeed need a connection.
 2015-02-04 23:35:02 +00:00
Marco Pivetta
97afe00d0f Merge pull request #1282 from Ocramius/hotfix/#1169-extra-lazy-one-to-many-should-not-delete-referenced-entities-2.4 
Hotfix/#1169 extra lazy one to many should not delete referenced entities (backport to 2.4)
 2015-01-25 05:44:14 +01:00
Marco Pivetta
51250e987e #1169 DDC-3343 - moved tests to correct test class 2015-01-24 12:51:19 +01:00
Marco Pivetta
c4b59b4eb0 #1169 DDC-3343 - adapting patch to 2.4 branch 2015-01-24 12:50:10 +01:00
Marco Pivetta
daca81861c #1169 DDC-3343 - additional test cases: removing proxies from an extra-lazy collection still updates the owning side values 2015-01-24 12:38:51 +01:00
Marco Pivetta
52fbe35bc7 #1169 DDC-3343 - correcting query count assertions on extra-lazy specific tests (some DELETE operations became UPDATE operations) 
Conflicts:
	lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php
	tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
 2015-01-24 12:38:44 +01:00
Marco Pivetta
50ac97e72d #1169 DDC-3343 - removing duplicate test 2015-01-24 12:37:41 +01:00
Marco Pivetta
cfed92a5cf #1169 DDC-3343 - integrating tests into the existing test suite 
Conflicts:
	tests/Doctrine/Tests/ORM/Functional/ValueConversionType/OneToManyExtraLazyTest.php
 2015-01-24 12:37:21 +01:00
Marco Pivetta
d69fd91454 #1169 DDC-3343 - importing used classe 2015-01-24 12:36:18 +01:00
Marco Pivetta
41258deed7 #1169 DDC-3343 - optimized imports 2015-01-24 12:36:10 +01:00
Marco Pivetta
193ec51607 #1169 DDC-3343 - refactoring test to use pre-existing test models 2015-01-24 12:36:01 +01:00
Marco Pivetta
7292920b15 #1169 DDC-3343 - refactoring test to use pre-existing test models 2015-01-24 12:35:50 +01:00
Marco Pivetta
24ebfb69cb #1169 DDC-3343 - minor refactoring: constant over string reference 2015-01-24 12:34:10 +01:00
Marco Pivetta
ff0168834e Conflicts: 
lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php
 2015-01-24 12:33:52 +01:00
Andrea Sprega
a88550a70c [DDC-3343] Failing test case (updated) 2015-01-24 12:32:30 +01:00
Andrea Sprega
ee246af7e3 [DDC-3343] Failing test case 2015-01-24 12:32:17 +01:00
Marco Pivetta
ba04c9801d Merge pull request #1276 from TomasVotruba/travis-coverage-speedup 
[2.4] travis: run coverage just once
 2015-01-22 15:03:10 +01:00
Tomas Votruba
5d637af056 travis: run coverage just once 2015-01-22 13:46:29 +01:00
Marco Pivetta
ec84953af4 Merge pull request #1266 from Ocramius/hotfix/fix-schema-generation-in-tests-on-pgsql 
[2.4] Fix schema generation in the test suite
 2015-01-22 12:30:16 +01:00
Marco Pivetta
56c5cb41fc DDC-3518 - Schema creation statement is not quoted 2015-01-18 17:39:10 +01:00
Guilherme Blanco
e0077b290b ORM side fixes. 2015-01-18 17:09:29 +01:00
Marco Pivetta
ee9aebf569 #1254 DDC-3500 - fixed duplicate JOIN aliases in CTI + WITH condition joins 2015-01-18 16:43:31 +01:00