Skip to content

Commit

Permalink
Applying PSR-2 standards format
Browse files Browse the repository at this point in the history
  • Loading branch information
@eduluz1976
eduluz1976 committed Nov 16, 2018
1 parent e97d360 commit 626ffe5
Show file tree
Hide file tree
Showing 18 changed files with 255 additions and 403 deletions.
14 changes: 7 additions & 7 deletions bootstrap.php
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

//require_once __DIR__ ."/../../vendor/autoload.php";

$toInclude = __DIR__ ."/vendor/autoload.php";

include $toInclude;
<?php

//require_once __DIR__ ."/../../vendor/autoload.php";

$toInclude = __DIR__ . '/vendor/autoload.php';

include $toInclude;
15 changes: 7 additions & 8 deletions bootstrap_test.php
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<?php
include_once __DIR__.'/bootstrap.php';
include_once __DIR__ . '/bootstrap.php';



function sampleFunction1($parm='') {
return '((('.$parm.')))';
function sampleFunction1($parm = '')
{
return '(((' . $parm . ')))';
}


function sampleFunction2($parm='') {
return ')))'.$parm.'(((';
function sampleFunction2($parm = '')
{
return ')))' . $parm . '(((';
}
46 changes: 18 additions & 28 deletions src/Action.php
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<?php
namespace eduluz1976\action;

namespace eduluz1976\action;

use eduluz1976\action\exception\InvalidURIException;

abstract class Action {

abstract class Action
{
/**
* @var Parameters
*/
protected $request;


/**
* @var Parameters
*/
Expand All @@ -28,41 +27,37 @@ abstract class Action {
*/
protected $uri;


/**
* @param string $uri
* @param array $request
* @param array $props
* @throws InvalidURIException
*/
public static function factory($uri, $request=[], $props=[]) {

if (ActionRemoteAPICall::checkURI($uri)) {
return ActionRemoteAPICall::build($uri, $request, $props);
} elseif (ActionClassMethod::checkURI($uri)) {
return ActionClassMethod::build($uri, $request, $props);
} elseif (ActionRegularFunction::checkURI($uri)) {
return ActionRegularFunction::build($uri, $request, $props);
} else {
throw new InvalidURIException("Invalid uri: $uri", 400);
}

public static function factory($uri, $request = [], $props = [])
{
if (ActionRemoteAPICall::checkURI($uri)) {
return ActionRemoteAPICall::build($uri, $request, $props);
} elseif (ActionClassMethod::checkURI($uri)) {
return ActionClassMethod::build($uri, $request, $props);
} elseif (ActionRegularFunction::checkURI($uri)) {
return ActionRegularFunction::build($uri, $request, $props);
} else {
throw new InvalidURIException("Invalid uri: $uri", 400);
}
}



abstract public static function checkURI($uri);
abstract public static function build($uri);

abstract public static function build($uri);

/**
* @param array $additionalRequestAttributes
*/
public function exec(array $additionalRequestAttributes=[]) {
public function exec(array $additionalRequestAttributes = [])
{
$this->getRequest()->addList($additionalRequestAttributes);
}


/**
* @return Parameters
*/
Expand Down Expand Up @@ -105,9 +100,4 @@ public function setResponse(Parameters $response): Action
$this->response = $response;
return $this;
}





}
}
38 changes: 15 additions & 23 deletions src/ActionClassMethod.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

namespace eduluz1976\action;


class ActionClassMethod extends Action
{
use DBAccessible;


protected $className;
protected $methodName;
protected $constructorParameters=[];
protected $constructorParameters = [];

/**
* @return mixed
Expand Down Expand Up @@ -66,15 +64,12 @@ public function setConstructorParameters(array $constructorParameters): ActionCl
return $this;
}




/**
* ActionRegularFunction constructor.
* @param string $functionName
* @param array $request
*/
public function __construct($className, $methodName, $request=[])
public function __construct($className, $methodName, $request = [])
{
$this->setClassName($className);
$this->setMethodName($methodName);
Expand All @@ -88,13 +83,13 @@ public function __construct($className, $methodName, $request=[])
* @param $uri
* @return bool
*/
public static function checkURI($uri) {
if ((strpos($uri, '::')!==false) && (substr($uri,-2) == '()')) {
public static function checkURI($uri)
{
if ((strpos($uri, '::') !== false) && (substr($uri, -2) == '()')) {
return true;
} else {
return false;
}

}

/**
Expand All @@ -103,10 +98,10 @@ public static function checkURI($uri) {
* @param array $props
* @return ActionClassMethod
*/
public static function build($uri, $request=[], $props=[]) {

$className = substr($uri,0,strpos($uri,'::'));
$methodName = substr($uri,strpos($uri,'::')+2,-2);
public static function build($uri, $request = [], $props = [])
{
$className = substr($uri, 0, strpos($uri, '::'));
$methodName = substr($uri, strpos($uri, '::') + 2, -2);

$obj = new ActionClassMethod($className, $methodName, $request);

Expand All @@ -121,7 +116,8 @@ public static function build($uri, $request=[], $props=[]) {
* @param array $additionalRequestAttributes
* @return mixed|void
*/
public function exec(array $additionalRequestAttributes=[]) {
public function exec(array $additionalRequestAttributes = [])
{
parent::exec($additionalRequestAttributes);

$className = $this->getClassName();
Expand All @@ -133,20 +129,16 @@ public function exec(array $additionalRequestAttributes=[]) {

$runner = [$obj, $this->getMethodName()];
$return = call_user_func_array($runner, $this->getRequest()->getList());
$this->getResponse()->add(0,$return);
$this->getResponse()->add(0, $return);
return $return;
}


protected function preparePlugins(&$obj) {

protected function preparePlugins(&$obj)
{
$traits = class_uses($obj);

if (in_array('eduluz1976\action\DBAccessible', $traits) && $this->getConn()) {
$obj->setConn($this->getConn());
}


}

}
}
28 changes: 13 additions & 15 deletions src/ActionRegularFunction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

namespace eduluz1976\action;


use eduluz1976\action\exception\FunctionNotFoundException;

class ActionRegularFunction extends Action
{

protected $functionName;

/**
Expand All @@ -28,13 +26,12 @@ public function setFunctionName($functionName)
return $this;
}


/**
* ActionRegularFunction constructor.
* @param string $functionName
* @param array $request
*/
public function __construct($functionName, $request=[])
public function __construct($functionName, $request = [])
{
$this->setFunctionName($functionName);
if (!empty($request)) {
Expand All @@ -46,13 +43,13 @@ public function __construct($functionName, $request=[])
* @param $uri
* @return bool
*/
public static function checkURI($uri) {
if (substr($uri,-2) == '()') {
public static function checkURI($uri)
{
if (substr($uri, -2) == '()') {
return true;
} else {
return false;
}

}

/**
Expand All @@ -61,8 +58,9 @@ public static function checkURI($uri) {
* @param array $props
* @return ActionRegularFunction
*/
public static function build($uri, $request=[], $props=[]) {
$functionName = trim(substr(trim($uri),0,-2));
public static function build($uri, $request = [], $props = [])
{
$functionName = trim(substr(trim($uri), 0, -2));
$obj = new ActionRegularFunction($functionName, $request, $props);
return $obj;
}
Expand All @@ -71,16 +69,16 @@ public static function build($uri, $request=[], $props=[]) {
* @param array $additionalRequestAttributes
* @return mixed
*/
public function exec(array $additionalRequestAttributes=[]) {
public function exec(array $additionalRequestAttributes = [])
{
parent::exec($additionalRequestAttributes);

if (!function_exists($this->getFunctionName())) {
throw new FunctionNotFoundException("Function '". $this->getFunctionName()."' not found");
throw new FunctionNotFoundException("Function '" . $this->getFunctionName() . "' not found");
}

$return = call_user_func_array($this->getFunctionName(), $this->getRequest()->getList());
$this->getResponse()->add(0,$return);
$this->getResponse()->add(0, $return);
return $return;
}

}
}
Loading

0 comments on commit 626ffe5

Please sign in to comment.