Skip to content

Commit

Permalink
Changing array representation
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Fiedler committed Jan 3, 2018
1 parent 3af4bd3 commit d41f870
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion controllers/home/homeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function template ($algo) {
'home',
['template'],
['template'],
array ('algo' => $algo)
['algo' => $algo]

);

Expand Down
4 changes: 2 additions & 2 deletions core/Engine/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct() {
/*
* Chama página de visão para o sistema.
*/
protected function loadView (string $controllerName, string $actionName, string $viewName, array $viewData = array()) {
protected function loadView (string $controllerName, string $actionName, string $viewName, array $viewData = []) {

if (file_exists(VIEWS_DIRECTORY . $controllerName . '/' . $actionName . '/' . $viewName . VIEWS_COMPLEMENT . '.php')) {

Expand All @@ -39,7 +39,7 @@ protected function loadTemplate (string $templateName,
string $controllerName,
array $actionNames,
array $viewsNames,
array $viewData = array ()) {
array $viewData = []) {

if (file_exists(TEMPLATES_DIRECTORY . $templateName . TEMPLATES_COMPLEMENT . '.php')) {

Expand Down
4 changes: 2 additions & 2 deletions core/Engine/Core.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private function setAditionalParameters () {
*
*/

private function defaultController() {
private function defaultController () {

$this->currentController = DEFAULT_CONTROLLER . '\\' .DEFAULT_CONTROLLER . CONTROLLERS_COMPLEMENT;

Expand All @@ -158,7 +158,7 @@ private function defaultController() {
*
* */

private function defaultAction() {
private function defaultAction () {

$this->currentAction = DEFAULT_ACTION . ACTION_COMPLEMENT;

Expand Down
2 changes: 1 addition & 1 deletion core/Engine/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/


use DATABASE as DATABASE;
use DATABASE;

class Model
{
Expand Down
6 changes: 3 additions & 3 deletions models/DATABASE/DATABASE_QUERY_GENERATE.Class.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ protected function generateTerms(array $tableTerms, string $intoTerms = ',') {
}

//Função que retorna possíveis itens adicionais que foram solicitados. Sendo eles: Order, Limit e WHERE
protected function additionalTerms (array $conditionTerms = array(),
array $orderTerms = array(),
array $limitTerms = array()) {
protected function additionalTerms (array $conditionTerms = [],
array $orderTerms = [],
array $limitTerms = []) {

$additionalTerms = "";

Expand Down
2 changes: 1 addition & 1 deletion models/DATABASE/DATABASE_RUN.Class.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected function initPrepare (string $prepareString) {
}

//Função que executará algo no prepare. O parâmetro de ser um array.
protected function runPrepare (array $execArrayParameters = array()) {
protected function runPrepare (array $execArrayParameters = []) {

if (is_array($execArrayParameters)){

Expand Down
14 changes: 7 additions & 7 deletions models/DATABASE/DATABASE_SELECT.Class.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ public function query(array $tableTerms,

public function prepare(array $tableTerms,
array $tableNames,
array $joinTerms = array(),
array $conditionTerms = array(),
array $orderTerms=array(),
array $limitTerms=array()){
array $joinTerms = [],
array $conditionTerms = [],
array $orderTerms = [],
array $limitTerms = []){

return
self::initPrepare(
Expand All @@ -103,9 +103,9 @@ public function prepare(array $tableTerms,

//Função que executará o prepare

public function execute(array $conditionValues = array(),
array $orderValues = array(),
array $limitValues = array()){
public function execute(array $conditionValues = [],
array $orderValues = [],
array $limitValues = []){

return
self::runPrepare(
Expand Down

0 comments on commit d41f870

Please sign in to comment.