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

Migrate to Laminas #19

Open
wants to merge 3 commits 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
25 changes: 0 additions & 25 deletions Module.php

This file was deleted.

24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
PhlyContact
====

This is a simple ZF2 module implementing a contact form.
This is a simple Laminas module implementing a contact form.

Requirements
----

* PHP >= 5.3.3
* Zend Framework 2, beta4 or later, specifically:
* Zend\Captcha (used for CAPTCHA functionality on the forms)
* Zend\InputFilter (used for validating the contact form); in turn, uses:
* Zend\Filter
* Zend\Uri
* Zend\Validator
* Zend\Form (the contact form itself; currently supports beta4 or later)
* Zend\Mail (for sending the contact emails)
* Zend\ModuleManager (implements a ZF2 module)
* Zend\Mvc (provides a controller)
* Zend\ServiceManager (provides service factories)
* Zend\View (provides view scripts for the PhpRenderer, and utilizes
* Laminas\Captcha (used for CAPTCHA functionality on the forms)
* Laminas\InputFilter (used for validating the contact form); in turn, uses:
* Laminas\Filter
* Laminas\Uri
* Laminas\Validator
* Laminas\Form (the contact form itself; currently supports beta4 or later)
* Laminas\Mail (for sending the contact emails)
* Laminas\ModuleManager (implements a Laminas module)
* Laminas\Mvc (provides a controller)
* Laminas\ServiceManager (provides service factories)
* Laminas\View (provides view scripts for the PhpRenderer, and utilizes
ViewModels in the controller)

Installation
Expand Down
5 changes: 3 additions & 2 deletions autoload_classmap.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

// Generated by ZF2's ./bin/classmap_generator.php
return array(
return [
'PhlyContact\Service\ContactControllerFactory' => __DIR__ . '/src/PhlyContact/Service/ContactControllerFactory.php',
'PhlyContact\Service\ContactCaptchaFactory' => __DIR__ . '/src/PhlyContact/Service/ContactCaptchaFactory.php',
'PhlyContact\Service\ContactFormFactory' => __DIR__ . '/src/PhlyContact/Service/ContactFormFactory.php',
Expand All @@ -9,4 +10,4 @@
'PhlyContact\Controller\ContactController' => __DIR__ . '/src/PhlyContact/Controller/ContactController.php',
'PhlyContact\Form\ContactFilter' => __DIR__ . '/src/PhlyContact/Form/ContactFilter.php',
'PhlyContact\Form\ContactForm' => __DIR__ . '/src/PhlyContact/Form/ContactForm.php',
);
];
5 changes: 3 additions & 2 deletions autoload_function.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?php

return function ($class) {
static $map;
if (!$map) {
if (! $map) {
$map = include __DIR__ . '/autoload_classmap.php';
}

if (!isset($map[$class])) {
if (! isset($map[$class])) {
return false;
}
return include $map[$class];
Expand Down
1 change: 1 addition & 0 deletions autoload_register.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<?php

spl_autoload_register(include __DIR__ . '/autoload_function.php');
66 changes: 56 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "phly/phly-contact",
"description": "ZF2 Module implementing contact form functionality",
"description": "Laminas Module implementing contact form functionality",
"type": "library",
"keywords": [
"zf2",
"zend",
"module"
],
"homepage": "https://github.com/weierophinney/PhlyContact",
"homepage": "https://github.com/phly/PhlyContact",
"authors": [
{
"name": "Matthew Weier O'Phinney",
Expand All @@ -17,14 +17,60 @@
],
"require": {
"php": ">=5.3.3",
"zendframework/zendframework": "2.*"
"laminas/laminas-dependency-plugin": "^2.1",
"laminas/laminas-authentication": "^2.5",
"laminas/laminas-barcode": "^2.5",
"laminas/laminas-cache": "^2.5",
"laminas/laminas-captcha": "^2.5",
"laminas/laminas-code": "^2.5",
"laminas/laminas-config": "^2.5",
"laminas/laminas-console": "^2.5",
"laminas/laminas-crypt": "^2.5",
"laminas/laminas-db": "^2.5",
"zendframework/zend-debug": "^2.5",
"laminas/laminas-di": "^2.5",
"laminas/laminas-dom": "^2.5",
"laminas/laminas-escaper": "^2.5",
"laminas/laminas-eventmanager": "^2.5",
"laminas/laminas-feed": "^2.5",
"laminas/laminas-file": "^2.5",
"laminas/laminas-filter": "^2.5",
"laminas/laminas-form": "^2.5",
"laminas/laminas-http": "^2.5",
"laminas/laminas-i18n": "^2.5",
"laminas/laminas-i18n-resources": "^2.5",
"laminas/laminas-inputfilter": "^2.5",
"laminas/laminas-loader": "^2.5",
"laminas/laminas-log": "^2.5",
"laminas/laminas-mail": "^2.5",
"laminas/laminas-math": "^2.5",
"laminas/laminas-memory": "^2.5",
"laminas/laminas-mime": "^2.5",
"laminas/laminas-modulemanager": "^2.5",
"laminas/laminas-mvc": "^2.5",
"laminas/laminas-navigation": "^2.5",
"laminas/laminas-paginator": "^2.5",
"laminas/laminas-permissions-acl": "^2.5",
"laminas/laminas-permissions-rbac": "^2.5",
"laminas/laminas-progressbar": "^2.5",
"laminas/laminas-serializer": "^2.5",
"laminas/laminas-server": "^2.5",
"laminas/laminas-servicemanager": "^2.5",
"laminas/laminas-session": "^2.5",
"laminas/laminas-soap": "^2.5",
"laminas/laminas-tag": "^2.5",
"laminas/laminas-test": "^2.5",
"laminas/laminas-text": "^2.5",
"laminas/laminas-uri": "^2.5",
"laminas/laminas-validator": "^2.5",
"zendframework/zend-version": "^2.5",
"laminas/laminas-view": "^2.5",
"laminas/laminas-xmlrpc": "^2.5",
"zendframework/zendxml": "^1.0.1"
},
"autoload": {
"psr-0": {
"PhlyContact": "src/"
},
"classmap": [
"./"
]
"psr-4": {
"PhlyContact\\": "src/"
}
}
}
}
115 changes: 59 additions & 56 deletions config/module.config.php
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
<?php
return array(
'phly_contact' => array(
'captcha' => array(

use PhlyContact\Controller\ContactController;
use PhlyContact\Service\ContactControllerFactory;

return [
'phly_contact' => [
'captcha' => [
'class' => 'dumb',
),
'form' => array(
],
'form' => [
'name' => 'contact',
),
'mail_transport' => array(
'class' => 'Zend\Mail\Transport\Sendmail',
'options' => array(
)
),
'message' => array(
],
'mail_transport' => [
'class' => 'Laminas\Mail\Transport\Sendmail',
'options' => [
]
],
'message' => [
/*
'to' => array(
'EMAIL HERE' => 'NAME HERE',
Expand All @@ -25,64 +29,63 @@
'EMAIL HERE' => 'NAME HERE',
),
*/
),
),
'controllers' => array(
'factories' => array(
'PhlyContact\Controller\Contact' => 'PhlyContact\Service\ContactControllerFactory',
),
),
'router' => array(
'routes' => array(
'contact' => array(
],
],
'controllers' => [
'factories' => [
ContactController::class => ContactControllerFactory::class,
],
],
'router' => [
'routes' => [
'contact' => [
'type' => 'Literal',
'options' => array(
'options' => [
'route' => '/contact',
'defaults' => array(
'__NAMESPACE__' => 'PhlyContact\Controller',
'controller' => 'Contact',
'defaults' => [
'controller' => ContactController::class,
'action' => 'index',
),
),
],
],
'may_terminate' => true,
'child_routes' => array(
'process' => array(
'child_routes' => [
'process' => [
'type' => 'Literal',
'options' => array(
'options' => [
'route' => '/process',
'defaults' => array(
'defaults' => [
'action' => 'process',
),
),
),
'thank-you' => array(
],
],
],
'thank-you' => [
'type' => 'Literal',
'options' => array(
'options' => [
'route' => '/thank-you',
'defaults' => array(
'defaults' => [
'action' => 'thank-you',
),
),
),
),
),
),
),
'service_manager' => array(
'factories' => array(
],
],
],
],
],
],
],
'service_manager' => [
'factories' => [
'PhlyContactCaptcha' => 'PhlyContact\Service\ContactCaptchaFactory',
'PhlyContactForm' => 'PhlyContact\Service\ContactFormFactory',
'PhlyContactMailMessage' => 'PhlyContact\Service\ContactMailMessageFactory',
'PhlyContactMailTransport' => 'PhlyContact\Service\ContactMailTransportFactory',
),
),
'view_manager' => array(
'template_map' => array(
],
],
'view_manager' => [
'template_map' => [
'phly-contact/contact/index' => __DIR__ . '/../view/phly-contact/contact/index.phtml',
'phly-contact/contact/thank-you' => __DIR__ . '/../view/phly-contact/contact/thank-you.phtml',
),
'template_path_stack' => array(
],
'template_path_stack' => [
'phly-contact' => __DIR__ . '/../view',
),
),
);
],
],
];
Loading