Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
9d7bd733
Commit
9d7bd733
authored
Jan 27, 2010
by
guilhermeblanco
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[2.0] Fixing issue with multiple class directory loading in Annotations driver
parent
8336bcc7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
15 deletions
+25
-15
AnnotationDriver.php
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
+25
-15
No files found.
lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
View file @
9d7bd733
...
...
@@ -346,25 +346,35 @@ class AnnotationDriver implements Driver
public
function
getAllClassNames
()
{
if
(
$this
->
_classDirectory
)
{
$iter
=
new
\RecursiveIteratorIterator
(
new
\RecursiveDirectoryIterator
(
$this
->
_classDirectory
),
\RecursiveIteratorIterator
::
LEAVES_ONLY
);
$classes
=
array
();
foreach
((
array
)
$this
->
_classDirectory
as
$dir
)
{
$iter
=
new
\RecursiveIteratorIterator
(
new
\RecursiveDirectoryIterator
(
$this
->
_classDirectory
),
\RecursiveIteratorIterator
::
LEAVES_ONLY
);
$declared
=
get_declared_classes
();
foreach
(
$iter
as
$item
)
{
$info
=
pathinfo
(
$item
->
getPathName
());
if
(
!
isset
(
$info
[
'extension'
])
||
$info
[
'extension'
]
!=
'php'
)
{
continue
;
$declared
=
get_declared_classes
();
foreach
(
$iter
as
$item
)
{
$info
=
pathinfo
(
$item
->
getPathName
());
if
(
!
isset
(
$info
[
'extension'
])
||
$info
[
'extension'
]
!=
'php'
)
{
continue
;
}
require_once
$item
->
getPathName
();
}
require_once
$item
->
getPathName
();
}
$declared
=
array_diff
(
get_declared_classes
(),
$declared
);
$declared
=
array_diff
(
get_declared_classes
(),
$declared
);
$classes
=
array
();
foreach
(
$declared
as
$className
)
{
if
(
!
$this
->
isTransient
(
$className
))
{
$classes
[]
=
$className
;
foreach
(
$declared
as
$className
)
{
if
(
!
$this
->
isTransient
(
$className
))
{
$classes
[]
=
$className
;
}
}
}
}
return
$classes
;
}
else
{
return
array
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment