Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
import
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lib
unicaen
import
Commits
4b1533e9
Commit
4b1533e9
authored
Nov 23, 2021
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
Migration Zend => Laminas
parent
311d922d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#11546
passed
Nov 23, 2021
Stage: publish
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Module.php
+4
-4
4 additions, 4 deletions
Module.php
tests/Bootstrap.php
+7
-7
7 additions, 7 deletions
tests/Bootstrap.php
tests/config/application.config.php
+1
-1
1 addition, 1 deletion
tests/config/application.config.php
with
12 additions
and
12 deletions
Module.php
+
4
−
4
View file @
4b1533e9
...
@@ -2,10 +2,10 @@
...
@@ -2,10 +2,10 @@
namespace
UnicaenImport
;
namespace
UnicaenImport
;
use
Zend
\ModuleManager\Feature\ConfigProviderInterface
;
use
Laminas
\ModuleManager\Feature\ConfigProviderInterface
;
use
Zend
\ModuleManager\Feature\ConsoleUsageProviderInterface
;
use
Laminas
\ModuleManager\Feature\ConsoleUsageProviderInterface
;
use
Zend
\Console\Adapter\AdapterInterface
as
ConsoleAdapterInterface
;
use
Laminas
\Console\Adapter\AdapterInterface
as
ConsoleAdapterInterface
;
use
Zend
\Mvc\MvcEvent
;
use
Laminas
\Mvc\MvcEvent
;
/**
/**
*
*
...
...
This diff is collapsed.
Click to expand it.
tests/Bootstrap.php
+
7
−
7
View file @
4b1533e9
<?php
<?php
namespace
UnicaenImportTest
;
namespace
UnicaenImportTest
;
use
Zend
\Loader\AutoloaderFactory
;
use
Laminas
\Loader\AutoloaderFactory
;
use
Zend
\Mvc\Service\ServiceManagerConfig
;
use
Laminas
\Mvc\Service\ServiceManagerConfig
;
use
Zend
\ServiceManager\ServiceManager
;
use
Laminas
\ServiceManager\ServiceManager
;
use
RuntimeException
;
use
RuntimeException
;
...
@@ -61,8 +61,8 @@ class Bootstrap
...
@@ -61,8 +61,8 @@ class Bootstrap
$zf2Path
=
ZF2_PATH
;
$zf2Path
=
ZF2_PATH
;
}
elseif
(
is_dir
(
$vendorPath
.
'/ZF2/library'
))
{
}
elseif
(
is_dir
(
$vendorPath
.
'/ZF2/library'
))
{
$zf2Path
=
$vendorPath
.
'/ZF2/library'
;
$zf2Path
=
$vendorPath
.
'/ZF2/library'
;
}
elseif
(
is_dir
(
$vendorPath
.
'/
zendframework/zendframework
/library'
))
{
}
elseif
(
is_dir
(
$vendorPath
.
'/
laminas/laminas
/library'
))
{
$zf2Path
=
$vendorPath
.
'/
zendframework/zendframework
/library'
;
$zf2Path
=
$vendorPath
.
'/
laminas/laminas
/library'
;
}
}
}
}
...
@@ -70,9 +70,9 @@ class Bootstrap
...
@@ -70,9 +70,9 @@ class Bootstrap
throw
new
RuntimeException
(
'Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.'
);
throw
new
RuntimeException
(
'Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.'
);
}
}
include
$zf2Path
.
'/
Zend
/Loader/AutoloaderFactory.php'
;
include
$zf2Path
.
'/
Laminas
/Loader/AutoloaderFactory.php'
;
AutoloaderFactory
::
factory
(
array
(
AutoloaderFactory
::
factory
(
array
(
'
Zend
\Loader\StandardAutoloader'
=>
array
(
'
Laminas
\Loader\StandardAutoloader'
=>
array
(
'autoregister_zf'
=>
true
,
'autoregister_zf'
=>
true
,
'namespaces'
=>
array
(
'namespaces'
=>
array
(
__NAMESPACE__
=>
__DIR__
.
'/'
.
__NAMESPACE__
,
__NAMESPACE__
=>
__DIR__
.
'/'
.
__NAMESPACE__
,
...
...
This diff is collapsed.
Click to expand it.
tests/config/application.config.php
+
1
−
1
View file @
4b1533e9
...
@@ -15,4 +15,4 @@ $testConfig = array(
...
@@ -15,4 +15,4 @@ $testConfig = array(
),
),
);
);
return
\
Zend
\Stdlib\ArrayUtils
::
merge
(
$appConfig
,
$testConfig
);
return
\
Laminas
\Stdlib\ArrayUtils
::
merge
(
$appConfig
,
$testConfig
);
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment