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

Package migrate to Laminas #16

Merged
merged 2 commits into from
Oct 12, 2020
Merged
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
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Requirements

- PHP >= 5.3.3
- Zend Framework 2 >= 2.0.0beta4, specifically:
- Zend\View\View, used to render and write generated files
- Zend\Mvc and Zend\ModuleManager, as this implements a module, and the
- Laminas\View\View, used to render and write generated files
- Laminas\Mvc and Laminas\ModuleManager, as this implements a module, and the
compiler script depends on it and an Application instance. As such, it also
has a dependency on Zend\Loader, Zend\ServiceManager, and Zend\EventManager.
- Zend\Feed\Writer
- Zend\Tag\Cloud
has a dependency on Laminas\Loader, Laminas\ServiceManager, and Laminas\EventManager.
- Laminas\Feed\Writer
- Laminas\Tag\Cloud
- PhlyCommon (for Entity and Filter interfaces)

Installation
Expand Down Expand Up @@ -146,7 +146,7 @@ You will want to setup local configuration; I recommend putting it in
'tag_feed_title_template' => 'Tag: %s :: Your Blog Name',

// If generating a tag cloud, you can specify options for
// Zend\Tag\Cloud. The following sets up percentage sizing from
// Laminas\Tag\Cloud. The following sets up percentage sizing from
// 80-300%
'tag_cloud_options' => array('tagDecorator' => array(
'decorator' => 'html_tag',
Expand All @@ -172,7 +172,7 @@ You will want to setup local configuration; I recommend putting it in
// Tag cloud generation is possible, but you likely need to capture
// the rendered cloud to inject elsewhere. You can do this with a
// callback.
// The callback will receive a Zend\Tag\Cloud instance, the View
// The callback will receive a Laminas\Tag\Cloud instance, the View
// instance, application configuration // (as an array), and the
// application's Locator instance.
'cloud_callback' => array('Application\Module', 'handleTagCloud'),
Expand All @@ -182,7 +182,7 @@ You will want to setup local configuration; I recommend putting it in
// creating your own in your own module, and make sure you alter the
// resolvers so that they point to the override locations. Below, I'm
// putting my overrides in my Application module.
'Zend\View\Resolver\TemplateMapResolver' => array('parameters' => array(
'Laminas\View\Resolver\TemplateMapResolver' => array('parameters' => array(
'map' => array(
'phly-blog/entry-short' => 'module/Application/view/phly-blog/entry-short.phtml',
'phly-blog/entry' => 'module/Application/view/phly-blog/entry.phtml',
Expand All @@ -192,7 +192,7 @@ You will want to setup local configuration; I recommend putting it in
),
)),

'Zend\View\Resolver\TemplatePathStack' => array('parameters' => array(
'Laminas\View\Resolver\TemplatePathStack' => array('parameters' => array(
'paths' => array(
'phly-blog' => 'module/Application/view',
),
Expand Down
57 changes: 54 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,63 @@
],
"require": {
"php": ">=5.3.3",
"zendframework/zendframework": "2.*",
"phly/phly-common": "dev-master"
"laminas/laminas-dependency-plugin": "^1.0",
"phly/phly-common": "dev-master",
"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-json": "^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-stdlib": "^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-4": {
"PhlyBlog\\": "src/"
}
}
}
}
20 changes: 10 additions & 10 deletions src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
namespace PhlyBlog;

use Traversable;
use Zend\Console\Adapter\AdapterInterface as Console;
use Zend\Http\PhpEnvironment\Request;
use Zend\Http\PhpEnvironment\Response;
use Zend\ModuleManager\Feature\ConsoleUsageProviderInterface;
use Zend\Stdlib\ArrayUtils;
use Zend\View\Renderer\PhpRenderer;
use Zend\View\Model;
use Zend\View\View;
use Laminas\Console\Adapter\AdapterInterface as Console;
use Laminas\Http\PhpEnvironment\Request;
use Laminas\Http\PhpEnvironment\Response;
use Laminas\ModuleManager\Feature\ConsoleUsageProviderInterface;
use Laminas\Stdlib\ArrayUtils;
use Laminas\View\Renderer\PhpRenderer;
use Laminas\View\Model;
use Laminas\View\View;

class Module implements ConsoleUsageProviderInterface
{
Expand All @@ -19,15 +19,15 @@ class Module implements ConsoleUsageProviderInterface
public function getAutoloaderConfig()
{
return array(
'Zend\Loader\ClassMapAutoloader' => array(
'Laminas\Loader\ClassMapAutoloader' => array(
__DIR__ . '/autoload_classmap.php'
),
);
}

public function getConfig()
{
return include __DIR__ . '/config/module.config.php';
return include __DIR__ . '/../config/module.config.php';
}

public function getServiceConfig()
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/AuthorEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace PhlyBlog;

use PhlyCommon\Entity as EntityDefinition;
use Zend\InputFilter\InputFilterInterface;
use Laminas\InputFilter\InputFilterInterface;

class AuthorEntity implements EntityDefinition
{
Expand Down
12 changes: 6 additions & 6 deletions src/PhlyBlog/CompileController.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
namespace PhlyBlog;

use RuntimeException;
use Zend\Console\Adapter\AdapterInterface as Console;
use Zend\Console\ColorInterface as Color;
use Zend\Console\Request as ConsoleRequest;
use Zend\EventManager\EventManagerInterface;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\View;
use Laminas\Console\Adapter\AdapterInterface as Console;
use Laminas\Console\ColorInterface as Color;
use Laminas\Console\Request as ConsoleRequest;
use Laminas\EventManager\EventManagerInterface;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\View;

class CompileController extends AbstractActionController
{
Expand Down
8 changes: 4 additions & 4 deletions src/PhlyBlog/Compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

use DateTime;
use DateTimezone;
use Zend\EventManager\EventManagerAwareInterface;
use Zend\EventManager\EventManagerInterface;
use Zend\EventManager\EventManager;
use Zend\Console\Exception as ConsoleException;
use Laminas\Console\Exception as ConsoleException;
use Laminas\EventManager\EventManagerAwareInterface;
use Laminas\EventManager\EventManagerInterface;
use Laminas\EventManager\EventManager;

class Compiler implements EventManagerAwareInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Compiler/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use DateTime;
use PhlyBlog\EntryEntity as Entry;
use Zend\EventManager\Event as BaseEvent;
use Laminas\EventManager\Event as BaseEvent;

class Event extends BaseEvent
{
Expand Down
14 changes: 7 additions & 7 deletions src/PhlyBlog/Compiler/Listener/AbstractList.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
use PhlyBlog\Compiler\Event;
use PhlyBlog\Compiler\ResponseFile;
use PhlyBlog\Compiler\WriterInterface;
use Zend\EventManager\EventManagerInterface as Events;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\Feed\Writer\Feed as FeedWriter;
use Zend\Paginator\Adapter\ArrayAdapter as ArrayPaginator;
use Zend\Paginator\Paginator;
use Zend\View\Model\ViewModel;
use Zend\View\View;
use Laminas\EventManager\EventManagerInterface as Events;
use Laminas\EventManager\ListenerAggregateInterface;
use Laminas\Feed\Writer\Feed as FeedWriter;
use Laminas\Paginator\Adapter\ArrayAdapter as ArrayPaginator;
use Laminas\Paginator\Paginator;
use Laminas\View\Model\ViewModel;
use Laminas\View\View;

abstract class AbstractList implements ListenerAggregateInterface, ListenerInterface
{
Expand Down
8 changes: 4 additions & 4 deletions src/PhlyBlog/Compiler/Listener/Entries.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
use PhlyBlog\CompilerOptions;
use PhlyBlog\Compiler\Event;
use PhlyBlog\Compiler\ResponseFile;
use Zend\EventManager\EventManagerInterface as Events;
use Zend\EventManager\ListenerAggregateInterface;
use Zend\View\View;
use Zend\View\Model\ViewModel;
use Laminas\EventManager\EventManagerInterface as Events;
use Laminas\EventManager\ListenerAggregateInterface;
use Laminas\View\View;
use Laminas\View\Model\ViewModel;

class Entries implements ListenerAggregateInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Compiler/Listener/Tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use DomainException;
use PhlyBlog\Compiler\Event;
use PhlyBlog\Compiler\SortedEntries;
use Zend\Tag\Cloud as TagCloud;
use Laminas\Tag\Cloud as TagCloud;

class Tags extends AbstractList
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Compiler/ResponseStrategy.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace PhlyBlog\Compiler;

use Zend\View\View;
use Laminas\View\View;

class ResponseStrategy
{
Expand Down
4 changes: 2 additions & 2 deletions src/PhlyBlog/CompilerOptions.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace PhlyBlog;

use Zend\Stdlib\AbstractOptions;
use Zend\Uri\UriFactory;
use Laminas\Stdlib\AbstractOptions;
use Laminas\Uri\UriFactory;

class CompilerOptions extends AbstractOptions
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/EntryEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use PhlyCommon\Entity as EntityDefinition;
use PhlyCommon\Filter\Timestamp as TimestampFilter;
use Zend\InputFilter\InputFilterInterface;
use Laminas\InputFilter\InputFilterInterface;

class EntryEntity implements EntityDefinition
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Filter/AuthorFilter.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace PhlyBlog\Filter;

use Zend\InputFilter\InputFilter;
use Laminas\InputFilter\InputFilter;

class AuthorFilter extends InputFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Filter/AuthorIsValid.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace PhlyBlog\Filter;

use PhlyBlog\AuthorEntity;
use Zend\Validator\AbstractValidator;
use Laminas\Validator\AbstractValidator;

class AuthorIsValid extends AbstractValidator
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Filter/EntryFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace PhlyBlog\Filter;

use PhlyCommon\Filter\Timezone as TimezoneValidator;
use Zend\InputFilter\InputFilter;
use Laminas\InputFilter\InputFilter;

class EntryFilter extends InputFilter
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Filter/Permalink.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PhlyBlog\Filter;

use Zend\Filter\FilterInterface;
use Laminas\Filter\FilterInterface;

class Permalink implements FilterInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/PhlyBlog/Filter/Tags.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace PhlyBlog\Filter;

use Zend\Validator\AbstractValidator;
use Laminas\Validator\AbstractValidator;

class Tags extends AbstractValidator
{
Expand Down
6 changes: 3 additions & 3 deletions src/PhlyBlog/Filter/Url.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php
namespace PhlyBlog\Filter;

use Zend\Uri\Uri;
use Zend\Uri\UriFactory;
use Zend\Validator\AbstractValidator;
use Laminas\Uri\Uri;
use Laminas\Uri\UriFactory;
use Laminas\Validator\AbstractValidator;

class Url extends AbstractValidator
{
Expand Down
2 changes: 1 addition & 1 deletion test/PhlyBlog/Compiler/Listener/TagsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function testCanCreateTagCloudFollowingCompilation()
{
$this->compiler->compile();
$cloud = $this->tags->getTagCloud();
$this->assertInstanceOf('Zend\Tag\Cloud', $cloud);
$this->assertInstanceOf('Laminas\Tag\Cloud', $cloud);
$markup = $cloud->render();
foreach ($this->expected['tags'] as $tag) {
$this->assertContains($tag, $markup);
Expand Down
8 changes: 4 additions & 4 deletions test/PhlyBlog/Compiler/Listener/TestHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
use PhlyBlog\Compiler;
use PhlyBlog\CompilerOptions;
use PhlyBlog\Compiler\TestAsset;
use Zend\Mvc\Router\Http\TreeRouteStack;
use Zend\View\View;
use Zend\View\Renderer;
use Zend\View\Resolver;
use Laminas\Mvc\Router\Http\TreeRouteStack;
use Laminas\View\View;
use Laminas\View\Renderer;
use Laminas\View\Resolver;

class TestHelper
{
Expand Down
4 changes: 2 additions & 2 deletions test/PhlyBlog/Compiler/ResponseStrategyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
namespace PhlyBlog\Compiler;

use PHPUnit_Framework_TestCase as TestCase;
use Zend\Mvc\MvcEvent;
use Zend\View\View;
use Laminas\Mvc\MvcEvent;
use Laminas\View\View;

class ResponseStrategyTest extends TestCase
{
Expand Down