Version 5.1 - All the GraphQL #32

Closed
timw4mail wants to merge 1160 commits from develop into master
8 changed files with 7 additions and 14 deletions
Showing only changes of commit aee2fa7120 - Show all commits

View File

@ -36,4 +36,4 @@ trait ContainerAware {
return $this->container; return $this->container;
} }
} }
// End of ContainerAware.php // End of ContainerAware.php

View File

@ -23,4 +23,4 @@ interface ContainerAwareInterface {
public function getContainer(); public function getContainer();
} }
// End of ContainerAwareInterface.php // End of ContainerAwareInterface.php

View File

@ -5,9 +5,7 @@ namespace Aviat\Ion\Di\Exception;
/** /**
* Generic exception for Di Container * Generic exception for Di Container
*/ */
class ContainerException class ContainerException extends \Exception implements \Interop\Container\Exception\ContainerException {
extends \Exception
implements \Interop\Container\Exception\ContainerException {
} }
// End of ContainerException.php // End of ContainerException.php

View File

@ -6,9 +6,7 @@ namespace Aviat\Ion\Di\Exception;
* Exception for Di Container when trying to access a * Exception for Di Container when trying to access a
* key that doesn't exist in the container * key that doesn't exist in the container
*/ */
class NotFoundException class NotFoundException extends ContainerException implements \Interop\Container\Exception\NotFoundException {
extends ContainerException
implements \Interop\Container\Exception\NotFoundException {
} }
// End of NotFoundException.php // End of NotFoundException.php

View File

@ -114,8 +114,6 @@ class Friend {
{ {
return NULL; return NULL;
} }
return NULL;
} }
} }
// End of Friend.php // End of Friend.php

View File

@ -158,7 +158,7 @@ class ArrayType {
/** /**
* Return the array, or a key * Return the array, or a key
* *
* @param string|integer $key * @param string|integer|null $key
* @return mixed * @return mixed
*/ */
public function &get($key = NULL) public function &get($key = NULL)
@ -189,6 +189,7 @@ class ArrayType {
public function set($key, $value) public function set($key, $value)
{ {
$this->arr[$key] = $value; $this->arr[$key] = $value;
return $this;
} }
/** /**

View File

@ -44,8 +44,6 @@ class HtmlView extends HttpView {
*/ */
public function render_template($path, $data) public function render_template($path, $data)
{ {
$buffer = "";
$data['helper'] = $this->helper; $data['helper'] = $this->helper;
$data['escape'] = $this->helper->escape(); $data['escape'] = $this->helper->escape();

View File

@ -43,4 +43,4 @@ function is_view_page()
return empty($intersect); return empty($intersect);
} }
// End of functions.php // End of functions.php