Version 4

.gitignore

@@ -0,0 +1 @@
+composer.lock

.travis.yml

@@ -1,8 +1,12 @@
 language: php
+
 php:
-  - '5.6'
   - '7.0'
   - '7.1'
-  - hhvm
+  - '7.2'
+
 install:
-  - composer install
+  - composer install -n
+
+script:
+  - vendor/bin/phpunit

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2007-2016 Fernando Val
+Copyright (c) 2007 Fernando Val
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -14,7 +14,7 @@ It was created based upon the KISS principle in which the simplicity is the base
 
 ## Requirements
 
-* PHP 5.5+
+* PHP 5.6+
 * [Composer](https://getcomposer.org/) Dependency Manager for PHP
 
 ## Language dependencies

www/system/classes/User.class.php → app/classes/User.class.php

@@ -136,7 +136,7 @@ public function getPermissionFor($aclObjectName)
     /**
      *  \brief The valitation rules to save into table.
      */
-    public function validationRules()
+    protected function validationRules()
     {
         return [
             'name'     => 'required',
@@ -149,7 +149,7 @@ public function validationRules()
     /**
      *  \brief Validation error messages.
      */
-    public function validationErrorMessages()
+    protected function validationErrorMessages()
     {
         return [
             'name' => [

www/system/controllers/index.page.php → app/controllers/index.page.php

@@ -2,11 +2,11 @@
 /**	\file
  * 	\brief Sample controller for the main page.
  *
- *  \copyright  ₢ 2007-2016 Fernando Val.
+ *  \copyright  ₢ 2007-2018 Fernando Val.
  *  \author     Fernando Val - [email protected]
  *  \ingroup    controllers
  */
-use \Springy\Controller;
+use Springy\Controller;
 
 class Index_Controller extends Controller
 {

components.php

@@ -1,29 +1,24 @@
 <?php
-/** \file
- *  Springy.
- *
- *  Post Install/Update Script for Composer
- *
- *  \copyright Copyright (c) 2015-2016 Fernando Val
+/**
+ * Post Install/Update Script for Composer.
  *
- *  \brief    Components - a post-install script for Composer
- *  \version  3.2.0.12
- *  \author   Fernando Val - [email protected]
+ * @copyright 2015-2018 Fernando Val
+ * @author    Fernando Val <[email protected]>
  *
- *  This script is executed by Composer after the install/update process.
+ * @version   3.2.1.13
  *
- *  The composer.json file is loaded and the "extra" section is used to it's configuration.
+ * This script is executed by Composer after the install/update process.
  *
- *  If the script find a "post-install" section inside the "extra" section, it do a copy of files
- *  downloaded by Composer to the "target" defined for every "vendor/package" listed.
+ * The composer.json file is loaded and the "extra" section is used to it's configuration.
  *
- *  If there is no "files" defined for every "vendor/package", their bower.json file is used by
- *  this script to decide which files will be copied.
+ * If the script find a "post-install" section inside the "extra" section, it do a copy of files
+ * downloaded by Composer to the "target" defined for every "vendor/package" listed.
  *
- *  \note To minify CSS and JS files, is recommended the use of the Minify class by Matthias Mullie.
- *      https://github.com/matthiasmullie/minify
+ * If there is no "files" defined for every "vendor/package", their bower.json file is used by
+ * this script to decide which files will be copied.
  *
- *  \ingroup framework
+ * NOTE: To minify CSS and JS files, is recommended the use of the Minify class by Matthias Mullie.
+ * https://github.com/matthiasmullie/minify
  */
 define('DS', DIRECTORY_SEPARATOR);
 
@@ -220,7 +215,13 @@
         continue;
     }
 
-    copy_r($path.DS.$files, $destination.DS.$files, $minify, $components[$component]);
+    $dstFile = $files;
+    if ($noSubdirs) {
+        $dstFile = explode('/', $files);
+        $dstFile = array_pop($dstFile);
+    }
+
+    copy_r($path.DS.$files, $destination.DS.$dstFile, $minify, $components[$component]);
 }
 
 // Write the lock file
@@ -231,7 +232,14 @@
 }
 
 /**
- *  \brief Recursive Copy Function.
+ * Recursive Copy Function.
+ *
+ * @param string $path
+ * @param string $dest
+ * @param bool   $minify
+ * @param array  $cFiles
+ *
+ * @return void
  */
 function copy_r($path, $dest, $minify, &$cFiles)
 {
@@ -296,7 +304,12 @@ function copy_r($path, $dest, $minify, &$cFiles)
 }
 
 /**
- *  \brief Minify the file if turned on.
+ * Minify the file if turned on.
+ *
+ * @param string $buffer
+ * @param string $minify
+ *
+ * @return mixed
  */
 function minify($buffer, $minify)
 {
@@ -348,7 +361,13 @@ function minify($buffer, $minify)
 }
 
 /**
- *  \brief Copy file minifyint if necessary.
+ * Copy file minifyint if necessary.
+ *
+ * @param string $source
+ * @param string $destiny
+ * @param string $minify
+ *
+ * @return bool
  */
 function realCopy($source, $destiny, $minify = 'auto')
 {

composer.json

@@ -4,7 +4,7 @@
     "license": "MIT",
     "type": "project",
     "config": {
-        "vendor-dir": "www/system/vendor"
+        "vendor-dir": "vendor"
     },
     "authors": [
         {
@@ -15,7 +15,7 @@
     ],
     "extra": {
         "installer-paths": {
-            "www/system/vendor/{$name}": ["vendor/package"]
+            "vendor/{$name}": ["vendor/package"]
         },
         "post-install": {
             "components/jquery": {
@@ -33,16 +33,16 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8",
-        "mockery/mockery": "~0.9"
+        "phpunit/phpunit": "~6.0",
+        "mockery/mockery": "~1.0"
     },
     "require": {
         "php": ">=5.6.0",
 
-        "smarty/smarty": "*",
-        "twig/twig": "*",
-        "ircmaxell/password-compat": "*",
-        "matthiasmullie/minify": "*",
+        "smarty/smarty": "3.1.*",
+        "twig/twig": "<2.5",
+        "ircmaxell/password-compat": "1.0.*",
+        "matthiasmullie/minify": "1.3.*",
         "sendgrid/sendgrid": "~5.0",
         "phpmailer/phpmailer": "~5.2",
 

www/system/conf/development/db.conf.php → conf/development/db.conf.php

@@ -24,7 +24,7 @@
 $conf = [
     'round_robin' => [
         'type'        => 'file',
-        'server_addr' => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'tpl_comp',
+        'server_addr' => sysconf('VAR_PATH'),
         'server_port' => 11211,
     ],
     'cache' => [

www/system/conf/mail.default.conf.php → conf/mail.default.conf.php

@@ -78,7 +78,7 @@
 /// Entradas para todos os ambientes
 $conf = [
     // Mail to notify system errors (used by framework)
-    'errors_go_to'    => '[email protected]',
+    'errors_go_to'    => '',
 
     // System Admin (used by framework)
     'system_adm_mail' => '[email protected]',

www/system/conf/system.default.conf.php → conf/system.default.conf.php

@@ -88,7 +88,7 @@
 
 /// Configurações para todos os ambientes
 $conf = [
-    'debug'              => false,
+    'debug'              => true,
     'ignore_deprecated'  => false,
     'rewrite_url'        => true,
     'cache'              => false,
@@ -98,11 +98,11 @@
     'developer_pass'     => '',
     'dba_user'           => '',
     'bug_authentication' => [],
-    'assets_source_path' => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'assets',
-    'assets_path'        => $GLOBALS['SYSTEM']['ROOT_PATH'].DIRECTORY_SEPARATOR.'assets',
-    'controller_path'    => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'controllers',
-    'css_path'           => $GLOBALS['SYSTEM']['ROOT_PATH'].DIRECTORY_SEPARATOR.'css',
-    'js_path'            => $GLOBALS['SYSTEM']['ROOT_PATH'].DIRECTORY_SEPARATOR.'js',
+    'assets_source_path' => sysconf('APP_PATH').DS.'assets',
+    'assets_path'        => sysconf('ROOT_PATH').DS.'assets',
+    'controller_path'    => sysconf('APP_PATH').DS.'controllers',
+    'css_path'           => sysconf('ROOT_PATH').DS.'css',
+    'js_path'            => sysconf('ROOT_PATH').DS.'js',
     'session'            => [
         'type'      => 'file', // 'file', 'memcached' or 'database'
         'name'      => 'SPRINGYSID', // The session cookie name

www/system/conf/template.default.conf.php → conf/template.default.conf.php

@@ -59,11 +59,11 @@
     'autoescape'             => false,
     'optimizations'          => 1,
     'debugging_ctrl'         => 'NONE',
-    'default_template_path'  => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'templates_default',
-    'template_path'          => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'templates',
-    'template_config_path'   => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'templates_conf',
-    'compiled_template_path' => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'tpl_comp',
-    'template_cached_path'   => $GLOBALS['SYSTEM']['SYSTEM_PATH'].DIRECTORY_SEPARATOR.'tpl_cache',
+    'default_template_path'  => sysconf('APP_PATH').DS.'templates_default',
+    'template_path'          => sysconf('APP_PATH').DS.'templates',
+    'template_config_path'   => sysconf('APP_PATH').DS.'templates_conf',
+    'compiled_template_path' => sysconf('VAR_PATH').DS.'compiled',
+    'template_cached_path'   => sysconf('VAR_PATH').DS.'cache',
     'use_sub_dirs'           => false,
     'errors'                 => [
         404 => '_error404',