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.

Sign up for GitHub

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

Jump to bottom

Migrate from ZendFramework to Laminas #2

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Migrate from ZendFramework to Laminas #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### ZendFramework ###
### Laminas ###
# Composer files
composer.phar
vendor/
Expand All @@ -14,4 +14,4 @@ data/logs/
data/cache/
data/sessions/
data/tmp/
temp/
temp/
22 changes: 11 additions & 11 deletions Module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Base module for integration of Pomm projects with ZF2 applications
* Base module for integration of Pomm projects with Laminas applications
*
* @license MIT
* @link http://www.pomm-project.org/
Expand All @@ -9,22 +9,22 @@

namespace PommProject\PommModule;

use Zend\ModuleManager\Feature\InitProviderInterface;
use Zend\ModuleManager\Feature\BootstrapListenerInterface;
use Zend\ModuleManager\Feature\ConfigProviderInterface;
use Zend\ModuleManager\ModuleManagerInterface;
use Zend\EventManager\EventInterface;
use Zend\Loader\StandardAutoloader;
use Laminas\ModuleManager\Feature\InitProviderInterface;
use Laminas\ModuleManager\Feature\BootstrapListenerInterface;
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
use Laminas\ModuleManager\ModuleManagerInterface;
use Laminas\EventManager\EventInterface;
use Laminas\Loader\StandardAutoloader;

use PommProject\PommModule\Service\Authentication\PommAuthenticationAdapter;

/**
* Integrate of Pomm projects with ZF2 applications
* Integrate of Pomm projects with Laminas applications
*/
class Module implements ConfigProviderInterface, InitProviderInterface, BootstrapListenerInterface
{
/**
* @var \Zend\ServiceManager\ServiceLocatorInterface
* @var \Laminas\ServiceManager\ServiceLocatorInterface
*/
private $serviceManager;

Expand Down Expand Up @@ -55,14 +55,14 @@ public function getConfig()
public function getAutoloaderConfig()
{
return array(
'Zend\Loader\StandardAutoloader' => array(
'Laminas\Loader\StandardAutoloader' => array(
'namespaces' => array(
__NAMESPACE__ => __DIR__ . '/src/',
),
),
);
}

/**
* {@inheritDoc}
*/
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PommModule
==========

Pomm module to use Pomm2 with zf2
Pomm module to use Pomm2 with Laminas

If you want to use Pomm 1.x, there's a 1.0 branch.

Expand Down Expand Up @@ -130,4 +130,4 @@ TODO
----

- Add a generator for model layer
- Add a generator for ZF2 configuration
- Add a generator for Laminas configuration
2 changes: 1 addition & 1 deletion bin/pomm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
require __DIR__ . '/../../../autoload.php';

// Run the application!
Zend\Mvc\Application::init($cliConfig)->run();
Laminas\Mvc\Application::init($cliConfig)->run();
33 changes: 25 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "pomm-project/pomm-module",
"description": "Zend Framework 2 Module that provides Pomm2 basic functionality",
"description": "Laminas Module that provides Pomm2 basic functionality",
"type": "library",
"license": "MIT",
"homepage": "http://www.pomm-project.org/",
"keywords": [
"pomm2",
"module",
"zf2"
"laminas"
],
"authors": [
{
Expand All @@ -18,16 +18,33 @@
],
"minimum-stability": "dev",
"require": {
"php": ">=5.4.4",
"pomm-project/model-manager": "2.0.*@dev",
"php": "^5.6 || ^7.0",
"pomm-project/foundation": "2.0.*@dev",
"zendframework/zendframework": "2 - 3",
"zendframework/zend-console": "2 - 3"
"pomm-project/model-manager": "2.0.*@dev",
"laminas/laminas-console": "^2.6",
"laminas/laminas-eventmanager": "^3.2",
"laminas/laminas-filter": "^2.9",
"laminas/laminas-inputfilter": "^2.10",
"laminas/laminas-loader": "^2.6",
"laminas/laminas-log": "^2.12",
"laminas/laminas-modulemanager": "^2.7",
"laminas/laminas-mvc": "^3.0",
"laminas/laminas-mvc-console": "^1.2",
"laminas/laminas-navigation": "^2.9",
"laminas/laminas-router": "^3.3",
"laminas/laminas-servicemanager": "^3.1",
"laminas/laminas-servicemanager-di": "^1.2.1",
"laminas/laminas-session": "^2.9",
"laminas/laminas-stdlib": "^3.0.1",
"laminas/laminas-text": "^2.6",
"laminas/laminas-validator": "^2.13"
},
"require-dev": {
"phpunit/phpunit": "4.0.7"
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20"
},
"bin": ["bin/pomm.php"],
"bin": [
"bin/pomm.php"
],
"autoload": {
"psr-4": {
"PommProject\\PommModule\\": "src/",
Expand Down
Loading