Marco Pivetta
cf3a54ab95
Removing empty newline
2015-12-11 20:00:59 +01:00
Marco Pivetta
16baa8d60f
#1573 - correcting docblock arguments/description
2015-12-11 20:00:08 +01:00
Marco Pivetta
41235f61de
#1573 removing unused API
2015-12-11 19:59:08 +01:00
Marco Pivetta
21a250fc02
Merge pull request #1472 from PowerKiKi/mariadb
...
Add test for MariaDB 5.5 and 10.1 on Travis
2015-12-11 19:45:09 +01:00
Marco Pivetta
9ac7c3bf70
Merge pull request #5547 from doctrine/hotfix/php7-xdebug-incompatibility-fixes
...
Correcting minor test case incompatibility with XDebug 2.4.x
2015-12-11 19:39:43 +01:00
Marco Pivetta
342ab2f7f1
Correcting minor test case incompatibility with XDebug 2.4.x
...
In PHP 5.x + XDebug < 2.4, the output would be "string:..."
In PHP 7.x + XDebug >= 2.4, the output would be "the/file/name.php:11:string:..."
This is an improvement in XDebug that is quite annoying for our purposes, but is actually welcome to most users anyway.
This commit simply fixes that incompatibility
2015-12-11 19:15:48 +01:00
Marco Pivetta
84f2bf7204
Merge branch 'docs/#1497-update-orm-documentation-for-utc-datetime-type'
...
Close #1497
2015-12-11 18:53:28 +01:00
Marco Pivetta
8c086d1a6e
#1497 - minor CS fixes
2015-12-11 18:53:18 +01:00
Marco Pivetta
df129635cf
#1497 - simplifying UTC datetime handling logic in the examples
...
Highly performance sensitive code should avoid method calls, sadly
2015-12-11 18:52:26 +01:00
Marco Pivetta
a130ff96ba
#1497 - Using a PHP code block to describe how a datetime+utc type can be set up
2015-12-11 18:48:23 +01:00
Marco Pivetta
5b22e59383
Removing symfony-specific documentation
2015-12-11 18:43:53 +01:00
Marco Pivetta
624fcb4486
Merge branch 'docs/#1496-docblock-fixes'
...
Close #1496
2015-12-11 18:27:36 +01:00
Marco Pivetta
00718f6bf7
#1496 s/$this/self
2015-12-11 18:27:19 +01:00
Damien Gavard
9b4dadade0
Use @return $this instead of @return static for consistency
2015-12-11 18:22:26 +01:00
Damien Gavard
5687347d60
Fix invalid return type documentation
2015-12-11 18:22:26 +01:00
Damien Gavard
15aafaa11d
Use @return $this instead of return explicitly QueryBuilder
2015-12-11 18:22:26 +01:00
Damien Gavard
8d62aadf55
Fix invalid return type in docblock
2015-12-11 18:22:26 +01:00
Marco Pivetta
b1bf57db48
Merge pull request #1408 from baileylo/patch-1
...
[doc] Remove unused variable from sample code
2015-12-11 18:19:26 +01:00
Marco Pivetta
9e68a5adc7
Merge pull request #1579 from aschempp/proxy-initialized-cs
...
Reduce code duplication in ProxyFactory::createInitializer
2015-12-11 18:16:53 +01:00
Benjamin Eberlei
a6ddac0a96
Remove link to issue tracker
2015-12-08 22:51:45 +01:00
Marco Pivetta
bd94931201
Merge pull request #1574 from Ma27/patch-1
...
deduplication of internal UnitOfWork methods
2015-12-08 19:02:28 +01:00
Andreas Schempp
4df7699ced
Reduce code duplication in ProxyFactory::createInitialized
...
The only difference between the ~30 lines in the IF-statement
is that the __wakup method is called on the proxy object.
2015-12-06 14:56:36 +01:00
bilouwan
fb4d02c69b
Refactor testing Proxy not initilized
2015-12-04 14:49:01 +01:00
bilouwan
d2cbdd1866
Fix superflous whitespaces & empty lines
2015-12-02 14:09:14 +01:00
Maximilian Bosch
f840f0d464
DDC-4022 execute callback parameter directly instead of using call_user_func
2015-12-01 22:31:27 +01:00
Maximilian Bosch
11f9b00d53
DDC-4022 method naming
2015-12-01 22:31:26 +01:00
Maximilian Bosch
33476d8c34
DDC-4022 minor improvements
2015-12-01 22:31:25 +01:00
Maximilian Bosch
c337f8f5c7
DDC-4022 deduplication of internal UnitOfWork methods
...
the methods UnitOfWork#afterTransactionRolledBack() and UnitOfWork#afterTransactionComplete do almost the same, so it can be abstracted into another private method.
2015-12-01 22:31:25 +01:00
Guilherme Blanco
3c3b7364ba
Hotfix for missing reverse dependency in case of non-implicit change tracking policies
2015-12-01 20:24:16 +00:00
Guilherme Blanco
9b77ba2c1a
Merge pull request #1570 from doctrine/DDC-2524
...
[RFC] Tests around reported cases over DDC-2524
2015-12-01 00:27:34 -05:00
David McKay
3c7d92e4cc
Fixed incorrect case of another two references of rollback
2015-11-30 16:53:31 +00:00
bilouwan
e8f40f58a1
Fix compatibility with php5.4
2015-11-30 10:35:42 +01:00
Guilherme Blanco
8ea62b95b8
Tests around reported cases over DDC-2524
2015-11-27 18:44:23 +00:00
bilouwan
832adae6b4
Unit test & fix for merge versionned entity
2015-11-27 17:28:45 +01:00
Guilherme Blanco
599f99471e
Merge pull request #1571 from montaniasystemab/patch-1
...
Fixed typo in QueryBuilder->where() docblock
2015-11-26 15:30:56 -05:00
montaniasystemab
b48fca543c
Fixed typo in QueryBuilder->where() docblock
2015-11-26 10:01:29 +01:00
Guilherme Blanco
57b22bd646
Merge pull request #1568 from guiwoda/patch-ddc-3967
...
Identifier is cached with wrong type
2015-11-24 22:17:59 -05:00
Guido Contreras Woda
e3627f1886
Test that reflects the issue described in http://www.doctrine-project.org/jira/browse/DDC-3967
2015-11-24 10:35:31 -03:00
Marco Pivetta
b980e98ba3
Merge pull request #1566 from BenMorel/typofix
...
Fix typos in DQL doc
2015-11-23 14:27:26 +01:00
Benjamin Morel
6d8778fd69
Fix typos in DQL doc
2015-11-23 12:18:18 +01:00
David McKay
f8ba3a3434
Fixing method name 'rollBack', which was documented as 'rollback'
2015-11-21 18:18:56 +00:00
Guilherme Blanco
3cff0f88bd
Merge pull request #1562 from deeky666/fix-empty-expression
...
Fix empty expression on PHP 5.4
2015-11-19 10:45:21 -05:00
Steve Müller
e0cb90d426
fix empty expression on PHP 5.4
2015-11-19 16:43:33 +01:00
Marco Pivetta
9c5cea3e95
Merge pull request #1561 from deeky666/DDC-4006
...
[DDC-4006] Inherit ID generator strategy mapping from embeddables
2015-11-19 16:34:32 +01:00
Guilherme Blanco
22e76e8624
Merge pull request #1559 from guiwoda/wrong-entity-cache-read-inheritance
...
Entity cache key is built differently on read than on write
2015-11-19 10:30:37 -05:00
Steve Müller
86c81da7ce
inherit ID generator strategy mapping from embeddables
2015-11-19 16:10:48 +01:00
Guido Contreras Woda
6c96e23a47
Test to verify the bug and the fix
2015-11-19 12:02:51 -03:00
Guilherme Blanco
0b45d96c74
Merge pull request #1560 from gitname/patch-2
...
Fix broken links
2015-11-17 21:40:13 -05:00
gitname
001d5b7ed3
Fix relative links
...
Fix 2 relative links to other docs files
2015-11-17 12:30:32 -08:00
Guido Contreras Woda
427642aaba
Entity cache key is built differently on read than on write
2015-11-17 16:10:17 -03:00
