Luís Cobucci
c2f698e56e
Merge pull request #6997 from NicolaF/fix/fix-6991-2.6
...
ManyToManyPersister fails to remove join table entry if there is multiple join columns
2018-01-30 01:19:12 +01:00
Nicolas FRANÇOIS
40f2a3efba
Add test case for many-to-many collection deletion, when owning side has a composite PK
2018-01-30 01:04:28 +01:00
Nicolas FRANÇOIS
333b9c0b99
Fix #6991 : correctly resolve identifer values in ManyToManyPersister
2018-01-19 12:19:02 +01:00
Luís Cobucci
90d19b4131
Bumping development version to v2.6.1-DEV
2017-12-20 02:01:05 +01:00
Luís Cobucci
374e7ace49
Preparing v2.6.0 release
2017-12-20 01:38:15 +01:00
Marco Pivetta
d752cafb47
Merge pull request #6911 from lcobucci/bump-dependencies
...
Require more up-to-date dependencies
2017-12-20 00:19:31 +01:00
Luís Cobucci
0e44271a40
Require more up-to-date dependencies
2017-12-20 00:10:05 +01:00
Marco Pivetta
4c89498359
Merge branch 'feature/#6767-allow-association-as-JTI-identifier'
...
Close #6767
2017-12-19 18:02:48 +01:00
Marco Pivetta
b6aa4bab15
#6767 using in_array
rather than array_search
...
Ref: https://github.com/doctrine/doctrine2/pull/6767/files#r157355050
2017-12-19 18:01:38 +01:00
Marco Pivetta
27c42d418b
#6767 removed unused variable
...
Ref: https://github.com/doctrine/doctrine2/pull/6767/files#r157354726
2017-12-19 18:00:03 +01:00
Tyler Romeo
bb8970286d
Allow association mappings as IDs for joined-table inherited entity
...
SchemaTool has custom logic for creating the primary key of a
joined-table inherited entity. This logic overlooked association maps
as a possible source for identity columns, resulting in a fatal error
when fetching the primary key list for child entities.
Removed any custom logic for generating primary keys for root entities
in joined-table inheritance, deferring to the common logic used for
other entities.
Also adjusted the child entity logic, scanning association maps for
identity columns, and including the column as appropriate. It also
ensures that the primary key columns are in the correct order.
2017-12-19 17:58:31 +01:00
Luís Cobucci
b210c1e364
Merge pull request #6905 from Majkl578/setup-cache-7.1-compat
...
Setup: Switch Apc -> Apcu and Memcache -> Memcached
2017-12-19 08:21:02 +01:00
Guilherme Blanco
a16dc65cd2
Fixes #1391 , DDC-3693
2017-12-18 22:46:48 -05:00
Guilherme Blanco
0345f7b836
Merge pull request #1578 from StoshSeb/patch-1
...
Fixed DDC-3740
2017-12-18 22:41:18 -05:00
Michael Moravec
349724f05b
Setup: Switch Apc -> Apcu and Memcache -> Memcached
2017-12-19 02:43:03 +01:00
Michael Moravec
e1825e37ef
Merge pull request #6780 from aequasi/patch-1
...
getRepository actually returns ObjectRepository
2017-12-18 00:40:47 +01:00
Luís Cobucci
cfa1dfbfe6
Merge pull request #6887 from greg0ire/stable_stability
...
Use stable packages
2017-12-18 00:39:02 +01:00
Grégoire Paris
8e3c3f0bae
Add marker variable for Travis
2017-12-18 00:14:00 +01:00
Grégoire Paris
ad3c3f4114
Implement conditional build
...
This will make cron builds fail, which is a bit more noticeable than an
allowed failure.
2017-12-17 23:38:16 +01:00
Grégoire Paris
8ca7db8852
Use stable packages
...
This will make it easier to contribute. It will also make reviews safer
since you will be able to tell if a PR is reponsible for a broken build
or not. Catching errors early is still possible by having a look at
allowed failures.
2017-12-17 23:38:16 +01:00
Michael Moravec
ca42879f9e
Merge pull request #6898 from Majkl578/upgrade-typos
...
UPGRADE: Added method parenthesis, fixed method name
2017-12-17 04:43:43 +01:00
Michael Moravec
28b6ca3a16
UPGRADE: Added method parenthesis, fixed method name
2017-12-17 04:31:42 +01:00
Luís Cobucci
c4a5e5c3f8
Merge pull request #6748 from KonstantinKuklin/patch1
...
Fix missing null check on `AbstractQuery#setResultCacheProfile()`
2017-12-17 03:37:06 +01:00
Konstantin Kuklin
c308986a90
Fix insufficient variable check
...
To ensure that `AbstractQuery#setResultCacheProfile()` doesn't raise
errors when being called with `null`.
2017-12-17 03:21:52 +01:00
Luís Cobucci
739f518ebe
Merge pull request #6892 from thexpand/patch-1
...
Re-order attributes of relation complex types
2017-12-17 02:49:49 +01:00
Cvetomir
a46e794b60
Re-order attributes of relation complex types
...
This will provide the same look for all of the relations: one-to-many, many-to-one, one-to-one, many-to-many.
It helps during auto-completion of XML code when creating XML schema for an entity.
The order is as follows: field, target-entity, mapped-by, inversed-by, indexed-by, fetch, orphan-removal.
2017-12-17 02:36:41 +01:00
Luís Cobucci
d3ff823f97
Merge pull request #6812 from Deltachaos/bugfix/inheritance-joins-master
...
Fix syntax error when join unrelated entity with discriminator entity
2017-12-17 01:42:42 +01:00
Maximilian Ruta
32c125def1
Fix syntax error when join with discriminator
2017-12-17 01:25:50 +01:00
Michael Moravec
0837493a7c
Merge pull request #6894 from Majkl578/fix-readme-php-version
...
README: Fix PHP version
2017-12-17 01:16:50 +01:00
Luís Cobucci
260c2e899a
Merge pull request #6897 from lcobucci/update-phpstan
...
Upgrade PHPStan to 0.9.x
2017-12-17 01:08:48 +01:00
Luís Cobucci
74ce8913fc
Upgrade phpstan to 0.9
...
Applying the necessary fixes.
2017-12-17 00:55:50 +01:00
Luís Cobucci
80a94727ee
Run tests also with the stable version of dependencies
2017-12-17 00:54:12 +01:00
Luís Cobucci
d6212dd09e
Merge pull request #6896 from lcobucci/improve-build-stages
...
Run all code quality tools in the same stage
2017-12-17 00:04:58 +01:00
Luís Cobucci
122e9c3aa3
Run all code quality tools in the same stage
...
In order to execute things in parallel and speed up the build.
2017-12-16 23:52:20 +01:00
Luís Cobucci
8e4f624f90
Merge pull request #6895 from lcobucci/simplify-LimitSubqueryWalker
...
Reduce complexity of LimitSubqueryWalker#walkSelectStatement()
2017-12-16 23:50:24 +01:00
Luís Cobucci
441c5d138c
Reduce complexity of LimitSubqueryWalker#walkSelectStatement()
...
Ensuring that the code follows our code standards.
2017-12-16 23:31:50 +01:00
Michael Moravec
b3654f95d0
README: Fix PHP version
2017-12-16 22:05:22 +01:00
Michael Moravec
aacea65519
Merge pull request #6889 from carusogabriel/clean-elses
...
Clean elses
2017-12-16 05:30:33 +01:00
Gabriel Caruso
d0d802309c
Clean elses
2017-12-14 05:55:54 -02:00
Michael Moravec
a352c214a0
Merge pull request #6805 from yesdevnull/patch-1
...
[Docs] Corrected NamingStrategy demo code to match example
2017-12-12 04:30:01 +01:00
Dan Barrett
cd00ccae69
Updated table/column names example to be lowercase
2017-12-11 12:14:39 +11:00
Guilherme Blanco
e149f89cfe
Merge pull request #6820 from plfort/#6819-pagination-optim
...
#6819 Optimize LimitSubqueryWalker
2017-12-10 19:56:31 -05:00
Marco Pivetta
b79b26aa8b
Merge pull request #5805 from borNfreee/patch-1
...
Fix typo in documentation
2017-12-08 09:44:35 +01:00
Maks Rafalko
04d9bc40e4
Update validation-of-entities.rst
2017-12-08 09:33:41 +03:00
Michael Moravec
31816f6e2f
Merge pull request #1442 from elazar/patch-1
...
Corrected bad class reference in "Adding own commands"
2017-12-08 05:13:04 +01:00
Michael Moravec
d32a8634aa
Merge pull request #5736 from guilliamxavier/patch-3
...
Fix PHP syntax error in composite-primary-keys.rst
2017-12-08 04:39:56 +01:00
Luís Cobucci
f13f7ebe54
Merge pull request #6862 from OskarStark/typo
...
fixed closing tag
2017-12-03 11:27:52 +01:00
Oskar Stark
79e1be8c3d
fixed closing tag
2017-12-01 15:41:52 +01:00
Luís Cobucci
92dd27fe3f
Merge pull request #6826 from JKapitein/patch-1
...
Add Type::GUID to $typeAlias list in EntityGenerator
2017-11-28 00:38:11 +01:00
JKapitein
ad0a8c53fa
Add Type::GUID to $typeAlias list in EntityGenerator
...
Right now, when generating entities, a column of type 'guid' will generate the following PHPDoc:
```
/**
* Get id
*
* @return guid
*/
public function getId() {...}
```
Since guid is not a valid PHP type, this throws a warning in PHPStorm, and I assume most IDEs.
Adding the type to the type alias list fixes the problem.
2017-11-28 00:11:32 +01:00