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
54050f8c
Commit
54050f8c
authored
Nov 23, 2007
by
wernerm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed getLoadedModels()
parent
86939d83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
Doctrine.php
lib/Doctrine.php
+2
-4
No files found.
lib/Doctrine.php
View file @
54050f8c
...
...
@@ -543,8 +543,8 @@ final class Doctrine
$loadedModels
=
array
();
foreach
((
array
)
$classes
as
$name
)
{
try
{
$declaredBefore
=
get_declared_classes
();
$class
=
new
ReflectionClass
(
$name
);
if
(
self
::
isValidModelClass
(
$class
))
{
$loadedModels
[]
=
$name
;
...
...
@@ -554,11 +554,10 @@ final class Doctrine
// The possibility exists that the class name(s) contained in the model
// file is not the same as the actual model file name itself
if
(
isset
(
self
::
$_loadedModels
[
$name
]))
{
$declaredBefore
=
get_declared_classes
();
try
{
$tmp
=
self
::
$_loadedModels
[
$name
];
require_once
self
::
$_loadedModels
[
$name
];
$declaredAfter
=
get_declared_classes
();
// Using array_slice since array_diff is broken is some versions
$foundClasses
=
array_slice
(
$declaredAfter
,
count
(
$declaredBefore
)
-
1
);
if
(
$foundClasses
)
{
foreach
(
$foundClasses
as
$name
)
{
...
...
@@ -575,7 +574,6 @@ final class Doctrine
}
}
return
$loadedModels
;
}
...
...
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