1
0
mirror of synced 2025-01-10 19:17:10 +03:00
Commit Graph

713 Commits

Author SHA1 Message Date
encoder64
5d608b6206 Private method EntityRepositoryGenerator::generateEntityRepositoryNamespace() changed to protected 2014-07-27 19:05:42 +03:00
encoder64
a4c7a89507 className fix: If namespace is not set then ClassName will be cut of 2014-07-27 17:28:06 +03:00
encoder64
c04b01cbd7 Added NS checking 2014-07-27 17:02:19 +03:00
encoder64
3dc2a68583 simple fixes 2014-07-27 15:22:51 +03:00
encoder64
90efaeec42 Code Style fixes 2014-07-27 14:54:35 +03:00
encoder64
c0ee57ae55 Default/Custom Entity Repository for Entity Repository Generator 2014-07-27 14:44:31 +03:00
Adrien Crivelli
27adf8d6e9 Refactor partial into options array
This coherent with what is done for Table. All platform specific things
are grouped into an options array. Eventually flags should be migrated
into options as well.
2014-07-22 10:32:31 +09:00
Adrien Crivelli
eeb7ff4a6d Support for Partial Indexes for PostgreSql and Sqlite
Support for Partial Indexes was available in Doctrine 1 following
http://www.doctrine-project.org/jira/browse/DC-82. This commit
reintroduce support for Doctrine 2. We use the same syntax with an
optionnal "where" attribute for Index and UniqueConstraint.
2014-07-22 10:32:30 +09:00
Marco Pivetta
90dee7036d Merge pull request #1067 from albertvolkman/add-fullstop-and-newline
Add fullstop and newline after property description.
2014-07-14 11:09:40 +02:00
Vasek Purchart
ee5f465a2f set namespace in setup only on CacheProvider instances 2014-06-26 01:29:35 +02:00
Andreas Hörnicke
eef32d4372 added method to be able to reuse the console application 2014-06-24 11:02:24 +02:00
Albert Volkman
247803715b Add fullstop and newline after property description. 2014-06-23 09:53:27 -04:00
FlorianLB
fdca5d7584 singularize variable name on add/remove methods for EntityGenerator 2014-06-19 10:00:40 +02:00
Steve Müller
dcf8d6a86e ignore case when checking for existing methods to avoid redeclaration on update 2014-06-05 15:58:54 +02:00
Marco Pivetta
5ee286e7e0 Merge pull request #1041 from c960657/entity-manager-interface
Allow all EntityManagerInterface implementations
2014-05-28 14:40:22 +02:00
Christian Schmidt
a7d072f525 Allow all EntityManagerInterface implementations
This is necessary if Doctrine\ORM\Decorator\EntityManagerDecorator is used.
2014-05-28 12:30:40 +02:00
Albert Volkman
49bca5171b Move space addition to implementation. 2014-05-21 16:27:36 -04:00
Guilherme Blanco
df806977c6 Updated fix for HHVM. 2014-04-18 03:05:41 +00:00
Guilherme Blanco
9441e063aa Updated XML Exporter to deal with some HHVM weirdness. 2014-04-18 03:04:04 +00:00
Guilherme Blanco
be1cc14a9c DDC-2890 Fixed pagination with association order by. 2014-04-17 19:29:18 +00:00
Guilherme Blanco
4029dc2ea8 Merge pull request #988 from holtkamp/DDC-3047-Exporter-association-fetch-modes
Exporter support for association fetch modes
2014-04-16 00:52:51 -04:00
Adrian Olek
b3a2988d2c CS fixes 2014-04-14 01:21:23 +02:00
Adrian Olek
cc2fb1a070 Added index flags support in annotation, xml & yaml mapping drivers. 2014-04-14 01:21:23 +02:00
Benjamin Eberlei
da24133306 Merge pull request #980 from adrianolek/convert-mapping-options
Added options attribute export to Annotation, Xml & Yaml exporters.
2014-04-13 23:38:30 +02:00
Benjamin Morel
1b4eafc873 Fixed validation message 2014-04-11 22:27:51 +00:00
Menno Holtkamp
8d0a5958eb Code-style improvement 2014-03-31 11:02:36 +02:00
Menno Holtkamp
59842e9bc6 Code-style improvement
Also to trigger Travis CI
2014-03-31 11:00:50 +02:00
Thomas Lomas
7d9630786b Update EntityGenerator comment
fieldVisibility was referred to as a boolean, where it is actually a string.
2014-03-29 01:49:12 +00:00
Menno Holtkamp
798075931a Exporter support for association fetch modes 2014-03-26 01:00:17 +01:00
Benjamin Eberlei
927d69b61a Merge pull request #957 from thealjey/master
makes doctrine less dependent upon the symfony yaml component
2014-03-23 15:41:27 +01:00
Benjamin Eberlei
8addb5ffa8 Merge pull request #960 from drealecs/fixes-EntityManagerInterface
allow passing EntityManagerInterface when creating a HelperSet
2014-03-23 15:36:38 +01: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
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
Fabio B. Silva
8c2aef3f14 [DDC-2943] Disable slc for pagination queries 2014-03-01 01:15:09 -05:00
Alexandru Patranescu
1fe6dbc1f2 allow passing EntityManagerInterface when creating a HelperSet 2014-02-23 20:01:14 +02:00
Eugene Kuzmenko
c06201303d makes doctrine less dependent upon the symfony yamp component 2014-02-20 09:28:44 +00:00
Marco Pivetta
5a2497d482 Merge pull request #935 from da-eto-ya/remove_public_validation
Remove incorrect (outdated) validation for public fields in SchemaValidator
2014-02-19 21:21:59 +01:00
Benjamin Morel
08f6291350 Cleaned up further unused imports. 2014-02-09 23:45:22 +00:00
Benjamin Morel
412e4ab9da Cleaned up unused imports 2014-02-09 22:12:51 +00:00
Benjamin Eberlei
4c4e4f6d3d Merge pull request #939 from doctrine/DDC-1985
[DDC-2939] Order Preservation
2014-02-09 15:43:57 +01:00
Wouter J
d7b917aa49 Fixed InputOption modes 2014-02-09 15:10:00 +01:00
Benjamin Eberlei
d31f7ebf57 [DDC-1985] Fix ordering preservation in SQL limit subquery output walker. 2014-02-08 17:01:55 +01:00
Benjamin Eberlei
8a0901c92b Merge pull request #835 from schmittjoh/ValueObjects
Value objects (Based on #634)
2014-02-08 16:24:47 +01:00
Ilya Pleshakov
1f3290faae Remove incorrect (outdated) validation for public fields in SchemaValidator 2014-02-06 13:02:41 +04:00
Tim Lieberman
25d71462e3 Make SchemaTool and SchemaValidator use EntityManagerInterface instead of EntityManager 2014-02-01 05:11:20 +00:00
Tim Lieberman
bf9fbd896b Substitute EntityManagerInterface for EntityManager in Console EntityManagerHelper 2014-02-01 00:23:23 +00:00
Tim Lieberman
43d94e7b5e Console EntityManagerHelper now accepts EntityManagerInterface as constructor argument, instead of insisting on an EntityManager 2014-01-31 15:32:31 -08:00
Guilherme Blanco
b65d9e6c83 Merge pull request #896 from holtkamp/patch-2
Ensure <cascade/> elements preceed <join-columns/>
2014-01-05 11:32:31 -08:00
Menno Holtkamp
fc2b9980ae Exclude exporting inheritanceType for INHERITANCE_TYPE_NONE 2014-01-05 18:53:31 +01:00
Menno Holtkamp
797fb9c34a Respected 'inheritanceType' at Entity level
It was (incorrectly) fetched from Table-level.
http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/annotations-reference.html#annref-inheritancetype
2014-01-05 18:41:55 +01:00
Menno Holtkamp
85a16f9f28 Ensure <cascade/> elements preceed <join-columns/>
When converting annotations based metadata to XML, the position of the <cascade/> elements resulted in XSD validation errors caused by the definitions of the association ComplexTypes:
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L463
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L482
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L495
- https://github.com/doctrine/doctrine2/blob/master/doctrine-mapping.xsd#L517

Since changing the XSD might result in validation problems in existing mappings, changing the XmlExporter seems a better approach.

Note that the '<cache/>' element is not yet generated by the XmlExporter, but according to the XML Schema, it should precede the '<cascade/>' element.
2014-01-05 15:34:59 +01:00
Johannes Schmitt
4f585a3d63 Merge branch 'master' of github.com:doctrine/doctrine2 into ValueObjects
Conflicts:
	UPGRADE.md
	lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php
2014-01-04 17:52:32 +01:00
Benjamin Eberlei
9a3cf77919 [DDC-2128] Fix PR according to comments. 2014-01-03 00:15:14 +01:00
catalin
93c018668d checking preg result. Should I raise an error
throw new ORMException("Error regular expression: " . $filter);
2014-01-03 00:15:14 +01:00
catalin
0d8f572661 added space after type cast (I could not find any rule in psr1/2 standard, but I modified in PhpStorm) 2014-01-03 00:15:14 +01:00
catalin
2326033e79 added preg_quote to $filter input 2014-01-03 00:15:13 +01:00
catalin
57e7559c1b - Applied Phpstorm PSR format
- Changed RegExp format
2014-01-03 00:15:13 +01:00
Catalinux
6963bf6028 Now MetaDataFilter takess also regexp. For example whern you want to
extract metadata if you would filter like this: --filter="Article"
would extract also for "ArticleItems" (article_items table). Now you
can use --filter="Article$" if you want only that table (articl)
2014-01-03 00:15:13 +01:00
Benjamin Eberlei
8118dddc6a Merge pull request #674 from TorbenBr/master
Shortcut for force
2014-01-02 15:02:46 -08:00
Benjamin Eberlei
41581847b2 Merge pull request #833 from ronanguilloux/patch-console-entity-generator
Generate-Entities-Console-Command: Adding an 'avoid backup' flag
2014-01-02 14:13:27 -08:00
Benjamin Eberlei
05576d3e1c Merge pull request #844 from terite/orm-validate-skip
Teach orm:validate-schema to --skip-mapping and --skip-sync
2014-01-02 14:00:22 -08:00
Sergey Polischook
07f67c5d1a Allow to not generate extra use
For case when we not generate annotation (by default at doctrine orm:generate-entities) allow to not generate extra use for it - 
```php
use Doctrine\ORM\Mapping as ORM;
```
For example if generate entities for my project that use only dbal in pord but use orm for generate entities in dev mode.
2013-12-30 04:43:35 +02:00
Benjamin Eberlei
ad9366a1fc Merge pull request #871 from elmariachi111/patch-1
XCache cannot be flushed on the CLI -> for pretty much the same reason as APC
2013-12-16 15:47:09 -08:00
fabios
71903c28a8 Region cache clear commands 2013-12-16 11:05:05 -05:00
Stefan A
eded05d415 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:51:41 +01:00
Stefan A
88a56ee8f8 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:51:02 +01:00
Stefan A
53fbb0b2d1 XCache cannot be cleared on CLI (like APC) 2013-12-10 19:48:30 +01:00
fabios
e69cd37226 Event listener to programmatically attach entity listeners. 2013-11-18 15:03:00 -05:00
Fabio B. Silva
3529cd4282 Merge pull request #797 from peterkokot/patch-1
CS fixes
2013-11-16 10:52:09 -08:00
David Stensland
e6be52af3a Teach orm:validate-schema to --skip-mapping and --skip-sync
Use --skip-mapping to not check if the current mapping informaiton
is valid or not.

Use --skip-sync to not check if the database schema is in line with
the current schema mapping.
2013-11-11 18:12:28 -05:00
Johannes M. Schmitt
0cd6061fc2 fixes a bad merge 2013-11-02 13:35:41 +01:00
Johannes M. Schmitt
d4e6618b28 Merge remote-tracking branch 'schmittjoh/ValueObjects' 2013-11-02 11:20:44 +01:00
Johannes M. Schmitt
38b041d909 Merge remote-tracking branch 'origin/ValueObjects'
Conflicts:
	lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
2013-11-01 20:17:43 +01:00
Ronan Guilloux
48d078a856 no-backup instead of nobackup 2013-10-31 12:25:43 +01:00
Ronan Guilloux
5c01e8e99e Generate-Entities-Console-Command: Adding an 'avoid creating backup files' flag 2013-10-31 12:00:32 +01:00
Benjamin Eberlei
fc53bc8909 Fix some LGPL occurances to MIT 2013-10-02 12:07:37 +02:00
Guilherme Blanco
d8335eee7b Merge pull request #793 from flip111/patch-2
Improved error messages in Paginator: LimitSubqueryOutputWalker
2013-09-30 11:07:49 -07:00
Cas
1fda797c8f Appended newline to (newly) generated files for PSR2 compatibility
Appended newline to (newly) generated files for PSR2 compatibility
Additionally, slightly improved styling of concatenating return value
2013-09-28 17:47:35 +02:00
Kristian Mide
0326731348 Respect unsigned fields when tables get converted to entities.
This is working on our mysql setup, however i have no idea of the consequences of this change when using other RDBMSes.
2013-09-26 14:41:06 +02:00
Peter Kokot
dca09148ca CS fixes 2013-09-22 02:12:30 +02:00
flip111
a18aba1bb6 Improved error messages in Paginator: LimitSubqueryOutputWalker
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '>' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.

Didn't use elseif in this commit as per Stof his suggestion.
2013-09-17 21:01:09 +02:00
flip111
b803f06c8f Improved error messages in Paginator: LimitSubqueryOutputWalker
The already existing follow-up check throwing "Not all identifier properties can be found in the ResultSetMapping: %s" is a much more technical description.

If $sqlIdentifier is empty (count 0) it can be concluded that there are no mapped results. An alternative error message could thus be "The Paginator does not support queries without mapped results." (line 153).

Possibly '!=' on line 154 could be replaced by '>' because i think this is the only situation that can occur. But since i don't know this for sure, i left it like i found it.
2013-09-17 15:07:08 +02:00
Maks Feltrin
f98dfc4758 DO NOT OVERRIDE CUSTOM TREE WALKERS IN getIterator() 2013-08-29 08:36:39 +02:00
Attila Fulop
5669aaf4a3 Fix for entity generator discriminator column 2013-08-28 18:26:16 +03:00
Adam Prager
b041c22814 Entity generator - trait in parent class 2013-08-20 12:15:17 +02:00
Douglas Greenshields
494ab1fc2b corrected English grammar in docblocks 2013-08-13 20:45:04 +01:00
Roger Llopart Pla
1bc6140394 Added docblock. 2013-08-10 16:58:07 +02:00
Roger Llopart Pla
7f1becf283 Appending the Paginator tree walker hint, instead of removing all the other hints. 2013-08-10 16:58:07 +02:00
Benjamin Eberlei
95af021ed9 Merge pull request #737 from Koc/fix-schema-validator-master
Skip not mapped public properties in SchemaValidator
2013-08-10 07:27:45 -07:00
Benjamin Eberlei
610e18949b Merge pull request #744 from jbruni/patch-1
Corrected PHP type for "decimal" mapping type
2013-08-10 07:23:50 -07:00
Konstantin.Myakshin
3c1fd9a3a9 Skip not mapped public properties in SchemaValidator 2013-08-07 01:18:15 +03:00
Guilherme Blanco
354d7050dc Merge pull request #720 from bakura10/fix-paginator
Allow to have non-distinct queries
2013-08-05 20:59:12 -07:00
J Bruni
3c613b9c02 Corrected PHP type for "decimal" mapping type
"Basic Mapping" documentation says:
"decimal: Type that maps a SQL DECIMAL to a PHP string."
2013-08-03 05:44:15 -03:00
Marco Pivetta
4bc8f7be16 Merge pull request #728 from armetiz/patch-1
Color message like the update tools
2013-07-22 08:19:50 -07:00
Thomas Tourlourat
4882ff1ef5 Add info tag around ATTENTION 2013-07-22 17:11:53 +02:00
Nicolas Nutten
eba933bb47 To avoid "SpacingAfterParams" error with PHPCS Symfony2 coding standard
Hello,
I added two blank lines in comments two avoid the following error with PHPCS Symfony2 coding standard :
Error Code: SpacingAfterParams
Error Description: Last parameter comment requires a blank new line after it.
2013-07-22 10:56:18 +02:00
Thomas Tourlourat
0c3581a1f8 Color message like the update tools 2013-07-19 11:33:35 +02:00
Guilherme Blanco
fbbb161987 Merge pull request #719 from tristanlins/fix/entity-generator-extensibility
Access properties via static:: instead of self::.
2013-07-17 17:18:01 -07:00