framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename interfaces, unset after unwrapping

Browse Source
This commit is contained in:
QWp6t
2015-12-18 18:55:19 -08:00
committed by Ben Word
parent 9eaffa3a2d
commit 97906e97e9
7 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/Sage/Asset.php
View File

@@ -1,6 +1,6 @@
<?php namespace Roots\Sage; <?php namespace Roots\Sage;
use Roots\Sage\Assets\IManifest; use Roots\Sage\Assets\ManifestInterface;
/** /**
* Class Template * Class Template
@@ -11,14 +11,14 @@ class Asset {
public static $dist = '/dist'; public static $dist = '/dist';
/** @var IManifest Currently used manifest */ /** @var ManifestInterface Currently used manifest */
protected $manifest; protected $manifest;
protected $asset; protected $asset;
protected $dir; protected $dir;
public function __construct($file, IManifest $manifest = null) { public function __construct($file, ManifestInterface $manifest = null) {
$this->manifest = $manifest; $this->manifest = $manifest;
$this->asset = basename($file); $this->asset = basename($file);
$this->dir = dirname($file) != '.' ? dirname($file) : ''; $this->dir = dirname($file) != '.' ? dirname($file) : '';

2
app/lib/Sage/Assets/JsonManifest.php
View File

@@ -5,7 +5,7 @@
* @package Roots\Sage * @package Roots\Sage
* @author QWp6t * @author QWp6t
*/ */
class JsonManifest implements IManifest { class JsonManifest implements ManifestInterface {
/** @var array */ /** @var array */
protected $manifest = []; protected $manifest = [];

4
app/lib/Sage/Assets/IManifest.php → app/lib/Sage/Assets/ManifestInterface.php
View File

@@ -1,11 +1,11 @@
<?php namespace Roots\Sage\Assets; <?php namespace Roots\Sage\Assets;
/** /**
* Interface IManifest * Interface ManifestInterface
* @package Roots\Sage * @package Roots\Sage
* @author QWp6t * @author QWp6t
*/ */
interface IManifest { interface ManifestInterface {
/** /**
* Get the cache-busted filename * Get the cache-busted filename

12
app/lib/Sage/Template.php
View File

@@ -1,6 +1,6 @@
<?php namespace Roots\Sage; <?php namespace Roots\Sage;
use Roots\Sage\Template\IWrapper; use Roots\Sage\Template\WrapperInterface;
/** /**
* Class Template * Class Template
@@ -10,7 +10,7 @@ use Roots\Sage\Template\IWrapper;
class Template { class Template {
protected static $root = 'templates/'; protected static $root = 'templates/';
/** @var IWrapper[] */ /** @var WrapperInterface[] */
protected static $wrappers = []; protected static $wrappers = [];
protected $templates = []; protected $templates = [];
@@ -20,11 +20,11 @@ class Template {
protected $html = ''; protected $html = '';
/** /**
* @param IWrapper $wrapper * @param WrapperInterface $wrapper
* @param array $context Variables to pass to wrapper * @param array $context Variables to pass to wrapper
* @return static Template instance of wrapper * @return static Template instance of wrapper
*/ */
public static function wrap(IWrapper $wrapper, $context = []) { public static function wrap(WrapperInterface $wrapper, $context = []) {
self::$wrappers[$wrapper->getSlug()] = $wrapper; self::$wrappers[$wrapper->getSlug()] = $wrapper;
return new static($wrapper->getWrappers(), $context); return new static($wrapper->getWrappers(), $context);
} }
@@ -40,7 +40,9 @@ class Template {
end(self::$wrappers); end(self::$wrappers);
$slug = key(self::$wrappers); $slug = key(self::$wrappers);
} }
return new static(self::$wrappers[$slug]->getTemplate(), $context); $template = new static(self::$wrappers[$slug]->getTemplate(), $context);
unset(self::$wrappers[$slug]);
return $template;
} }
/** /**

4
app/lib/Sage/Template/Wrapper.php
View File

@@ -1,11 +1,11 @@
<?php namespace Roots\Sage\Template; <?php namespace Roots\Sage\Template;
/** /**
* Interface Wrapper * Class Wrapper
* @package Roots\Sage * @package Roots\Sage
* @author QWp6t * @author QWp6t
*/ */
class Wrapper implements IWrapper { class Wrapper implements WrapperInterface {
/** @var string Wrapper slug */ /** @var string Wrapper slug */
protected $slug; protected $slug;

6
app/lib/Sage/Template/IWrapper.php → app/lib/Sage/Template/WrapperInterface.php
View File

@@ -1,11 +1,11 @@
<?php namespace Roots\Sage\Template; <?php namespace Roots\Sage\Template;
/** /**
* Interface IWrapper * Interface WrapperInterface
* @package Roots\Sage * @package Roots\Sage
* @author QWp6t * @author QWp6t
*/ */
interface IWrapper { interface WrapperInterface {
/** /**
* Get a list of potential wrappers * Get a list of potential wrappers
@@ -21,7 +21,7 @@ interface IWrapper {
public function getTemplate(); public function getTemplate();
/** /**
* @return string Slug of the Wrapper; e.g., `base` * @return string Slug of the WrapperInterface; e.g., `base`
*/ */
public function getSlug(); public function getSlug();
} }

2
composer.json
View File

@@ -35,7 +35,7 @@
] ]
}, },
"require": { "require": {
"php": ">=5.5.0", "php": ">=5.4.0",
"composer/installers": "~1.0" "composer/installers": "~1.0"
} }
} }