Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laminas support #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
],
"require": {
"php": "^5.5 || ^7.0",
"zendframework/zend-modulemanager": "^2.5",
"zendframework/zend-loader": "^2.5",
"zendframework/zend-eventmanager": "^2.5 || ^3.0",
"zendframework/zend-mvc": "^2.5 || ^3.0",
"zendframework/zend-navigation": "^2.5"
"laminas/laminas-modulemanager": "^2.5",
"laminas/laminas-loader": "^2.5",
"laminas/laminas-eventmanager": "^2.5 || ^3.0",
"laminas/laminas-mvc": "^2.5 || ^3.0",
"laminas/laminas-navigation": "^2.5",
"laminas/laminas-dependency-plugin": "^1.0"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be removed I think as laminas/laminas-dependency-plugin mostly used for project, not module.

},
"suggest": {
"bjyoungblood/bjy-authorize": "Access control to protect ZfcAdmin against unauthorized users"
Expand All @@ -42,4 +43,4 @@
]
}
}
}
}
2 changes: 1 addition & 1 deletion docs/3.Navigation.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ In the following example, there is a navigation element called "My Module" and p
),
),

The navigation in ZfcAdmin uses `Zend\Navigation` and more information about the configuration of this component is located in the [Zend Framework 2](http://framework.zend.com/manual/2.0/en/modules/zend.navigation.quick-start.html) reference guide.
The navigation in ZfcAdmin uses `Laminas\Navigation` and more information about the configuration of this component is located in the [Zend Framework 2](http://framework.zend.com/manual/2.0/en/modules/zend.navigation.quick-start.html) reference guide.

## Link to documentation pages

Expand Down
2 changes: 1 addition & 1 deletion src/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

namespace ZfcAdmin\Controller;

use Zend\Mvc\Controller\AbstractActionController;
use Laminas\Mvc\Controller\AbstractActionController;

/**
* Placeholder controller
Expand Down
16 changes: 8 additions & 8 deletions src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@

namespace ZfcAdmin;

use Zend\Loader;
use Zend\EventManager\EventInterface;
use Zend\Mvc\MvcEvent;
use Zend\Mvc\Router\RouteMatch as V2RouteMatch;
use Zend\Router\RouteMatch as V3RouteMatch;
use Zend\ServiceManager\Factory\InvokableFactory;
use Laminas\Loader;
use Laminas\EventManager\EventInterface;
use Laminas\Mvc\MvcEvent;
use Laminas\Mvc\Router\RouteMatch as V2RouteMatch;
use Laminas\Router\RouteMatch as V3RouteMatch;
use Laminas\ServiceManager\Factory\InvokableFactory;

/**
* Module class for ZfcAdmin
Expand Down Expand Up @@ -111,7 +111,7 @@ public function getConfig()
*/
public function onBootstrap(EventInterface $e)
{
/** @var \Zend\Mvc\Application $app */
/** @var \Laminas\Mvc\Application $app */
$app = $e->getParam('application');
$em = $app->getEventManager();

Expand All @@ -126,7 +126,7 @@ public function onBootstrap(EventInterface $e)
*/
public function selectLayoutBasedOnRoute(MvcEvent $e)
{
/** @var \Zend\Mvc\Application $app */
/** @var \Laminas\Mvc\Application $app */
$app = $e->getParam('application');
$sm = $app->getServiceManager();
$config = $sm->get('config');
Expand Down
2 changes: 1 addition & 1 deletion src/Navigation/Service/AdminNavigationFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

namespace ZfcAdmin\Navigation\Service;

use Zend\Navigation\Service\DefaultNavigationFactory;
use Laminas\Navigation\Service\DefaultNavigationFactory;

/**
* Factory for the ZfcAdmin admin navigation
Expand Down