symfony / symfony

dpitard wants someone to pull 6 commits into symfony:master from dpitard:master

Showing 1 comment with 6 commits and 2 commit comments

#16 Closed

Untitled

dpitard — Fri Oct 08 10:37:21 -0700 2010

Hey Fabien,

In Doctrine bundle, we're not allowed to use annotation without alias anymore (@Entity, @Id...) and must use annotatation namespace aliases like @orm:Entity.

Here's a fix to set ORM as the default annotation namespace and allow the old annotation pattern back.

dpitard added some commits

Tue Aug 31 10:09:29 -0700 2010

2dc8c4f fixed wrong test in FlattenException::getStatusCode()

fabpot commented on 2dc8c4f

Tue Aug 31 10:21:31 -0700 2010

fixed in 1e1a411.

dpitard and others added some commits

Wed Sep 01 05:09:45 -0700 2010

`db76aa1`		`merged with upstream/master`
`60054d1`		`Merge remote branch 'upstream/master'`
`793237d`		`Merge remote branch 'upstream/master'`
`737ea0e`		`Merge remote branch 'upstream/master'`
`bc14b57`		`set default annotation namespace to Doctrine\ORM\Mapping`

fabpot commented on bc14b57

Sat Oct 09 05:27:21 -0700 2010

That was done on purpose. You must use the alias now.

fabpot commented

Sat Oct 09 05:27:49 -0700 2010

That was done on purpose. Use the @orm: alias now.

Comment on this pull request

You must be logged in to comment on pull requests.

Showing 6 unique commits by 2 authors.

`2dc8c4f7`	dpitard	`fixed wrong test in FlattenException::getStatusCode()`	Tue Aug 31 10:09:29 -0700 2010
`db76aa10`	dpitard	`merged with upstream/master`	Wed Sep 01 05:09:45 -0700 2010
`60054d10`	dpitard	`Merge remote branch 'upstream/master'`	Wed Sep 22 08:33:20 -0700 2010
`793237dd`	root	`Merge remote branch 'upstream/master'`	Fri Sep 24 03:07:06 -0700 2010
`737ea0e9`	dpitard	`Merge remote branch 'upstream/master'`	Fri Oct 08 12:16:55 -0700 2010
`bc14b57d`	dpitard	`set default annotation namespace to Doctrine\ORM\Mapping`	Fri Oct 08 12:26:35 -0700 2010

Showing 1 changed files with 4 additions and 1 deletion.

src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

5 •••••

src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml

View file @ bc14b57

@@ -52,6 +52,9 @@
               <argument>Doctrine\ORM\Mapping\</argument>
               <argument>orm</argument>
             </call>
+            <call method="setDefaultAnnotationNamespace">
+              <argument>Doctrine\ORM\Mapping\</argument>
+            </call>
         </service>
 
         <!--- XML Metadata Driver Service -->
@@ -64,4 +67,4 @@
             <argument>%doctrine.orm.metadata_driver.mapping_dirs%</argument>
         </service>
     </services>
-</container>
\ No newline at end of file
+</container>

symfony / symfony

Untitled

Comment on this pull request

Active Participants

Your current locale selection: English. Choose another?

Keyboard Shortcuts

Site wide shortcuts

Commit list

Pull request list

Issues

Network Graph

...	...	@@ -52,6 +52,9 @@
52	52	<argument>Doctrine\ORM\Mapping\</argument>
53	53	<argument>orm</argument>
54	54	</call>
	55	+ <call method="setDefaultAnnotationNamespace">
	56	+ <argument>Doctrine\ORM\Mapping\</argument>
	57	+ </call>
55	58	</service>
56	59
57	60	<!--- XML Metadata Driver Service -->
...	...	@@ -64,4 +67,4 @@
64	67	<argument>%doctrine.orm.metadata_driver.mapping_dirs%</argument>
65	68	</service>
66	69	</services>
67		-</container>
68	70	\ No newline at end of file
	71	+</container>