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 #5

Open
wants to merge 1 commit into
base: develop
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
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
],
"require": {
"php": ">=5.5",
"zendframework/zend-stdlib": "^2.6 || ^3.0",
"zendframework/zend-escaper": "^2.5"
"laminas/laminas-stdlib": "^2.6 || ^3.0",
"laminas/laminas-escaper": "^2.5"
},
"require-dev": {
"phpunit/phpunit": "^4.7",
Expand Down
2 changes: 1 addition & 1 deletion src/Renderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace Phly\Mustache;

use Traversable;
use Zend\Escaper\Escaper;
use Laminas\Escaper\Escaper;

/**
* Mustache renderer
Expand Down
2 changes: 1 addition & 1 deletion src/Resolver/AggregateResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Countable;
use IteratorAggregate;
use Phly\Mustache\Exception;
use Zend\Stdlib\PriorityQueue;
use Laminas\Stdlib\PriorityQueue;

class AggregateResolver implements Countable, IteratorAggregate, ResolverInterface
{
Expand Down
2 changes: 1 addition & 1 deletion test/MustacheTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ public function testComposesAggregateResolverWithDefaultResolverComposedByDefaul
$this->assertTrue($resolver->hasType(DefaultResolver::class));

// Now, make sure it's at the end of the queue. This requires:
// - Fetching the queue property (a Zend\Stdlib\PriorityQueue)
// - Fetching the queue property (a Laminas\Stdlib\PriorityQueue)
// - Fetching the iterator from the queue (an SplPriorityQueue)
// - Extracting the priority specification for the resolver (an array of
// priority, seed within priority)
Expand Down
2 changes: 1 addition & 1 deletion test/Pragma/ContextualEscapeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use Phly\Mustache\Pragma;
use Phly\Mustache\Renderer;
use PHPUnit_Framework_TestCase as TestCase;
use Zend\Escaper\Escaper;
use Laminas\Escaper\Escaper;

class ContextualEscapeTest extends TestCase
{
Expand Down