Skip to content

Commit

Permalink
Merge branch 'release/v3.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
enfoqueNativo committed Dec 27, 2019
2 parents a44e351 + b2a8985 commit b6bc1d3
Show file tree
Hide file tree
Showing 240 changed files with 7,270 additions and 40,526 deletions.
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@

[CURRENT](https://github.com/SIU-Toba/framework/compare/master...develop)

[3.3.0](https://github.com/SIU-Toba/framework/releases/tag/v3.3.0) (2019-12-27)
- Se fija como version minima de PHP 7.3.0
- Se actualiza el item de login en toba_usuarios y toba_referencia, tambien se eliminan objetos huerfanos
- Se agrega FK a la tabla apex_grupo_acc_restriccion_funcional
- Se compatibiliza el mecanismo de actualizacion de secuencias y recuperacion de definicion de tablas con Postgresql 12
- Se actualizan los siquientes paquetes:
* symfony/yaml: v4.4
* guzzlehttp/guzzle: v6.5
* michelf/php-markdown: v1.9
* phpmailer/phpmailer: v6.1
* phpoffice/phpspreadsheet: v1.10
* vlucas/dotenv: v3.6
* psr/log: v1.1
* siu/manejador-salida-toba: v1.1
* simpletest/simpletest: v1.2
- Se brinda la posibilidad de definir si la salida de una vista se enviara inline o como adjunto
- Se actualiza la interface del tipo de pagina popup para compatibilizar con los cambios en el manejador de salida
- Se agrega la posibilidad de cambiar el pwd de un usuario determinado via comando de consola
- Se agrega la posibilidad de marcar la instalacion para solicitar un segundo factor luego de loguear con un IDP
- Se eliminan los assets correspondientes a Yahoo/YUI por cuestiones de seguridad y el menu basado en las mismas
- Las membresias de perfiles funcionales se exportan en un archivo separado en una instalacion de produccion
- Se actualiza el paquete siu/interfaces-manejador-salida-toba @v1.2 por bugfixes (rompe BC)
- La exportacion via toba_vista_excel ahora tendra el formato xlsx
- Se simplifica tratamiento de ef_fieldset en el formulario
- Se pasa el paquete siu/rdi a suggested

[3.2.10](https://github.com/SIU-Toba/framework/releases/tag/v3.2.10) (2019-11-25)
- Fix a la desactivacion de eventos (con manejador-bootstrap)
- Se actualizan los paquetes:
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ Framework para desarrollo rápido de aplicaciones web

## Prerequisitos
* Hay que tener instalado [Composer](https://getcomposer.org/)
* Hay que tener instalado [Yarn](https://yarnpkg.com/) (para SIU-Toba v3.1+)
* Hay que tener instalado [Bower](https://bower.io/) (v1.8.4 o superior) para la rama 3.0.x
* Hay que tener instalado [Yarn](https://yarnpkg.com/)

## Instalando SIU-Toba

Expand All @@ -21,7 +20,7 @@ La descarga de SIU-Toba a partir de la version 3.0 se lleva a cabo enteramente v
}
],
"require": {
"siu-toba/framework": "^3.1"
"siu-toba/framework": "~3.3"
},
"scripts": {
"post-install-cmd": [
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.10
3.3.0
17 changes: 8 additions & 9 deletions bin/launcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,30 @@
if (! isset($_SERVER['TOBA_DIR'])) {
$toba_dir = realpath(__DIR__.'/../');
$path_autoload = '/vendor/autoload.php';

if (! file_exists($toba_dir.$path_autoload)) {
//Estoy dentro del vendor/bin de composer
$path_autoload = '/../../..'. $path_autoload;

if (! file_exists($toba_dir.$path_autoload)) {
die("No se encuentra la carpeta de Toba, ni la variable de entorno TOBA_DIR");
}
}
$_SERVER['TOBA_DIR'] = $toba_dir;

//Hago todas las rutas relativas a TOBA_DIR que es lo unico constante
include(realpath($toba_dir . $path_autoload)); //Necesito cargar el autoload de composer antes, sino no funca nada
$path_env = (stripos($toba_dir, DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR) !== false) ? realpath($toba_dir . '/../../../') : $toba_dir;
if (file_exists($path_env. '/entorno_toba.env')) {
$path_env = (stripos($toba_dir, DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR) !== false) ? realpath($toba_dir . '/../../../') : $toba_dir;
if (file_exists($path_env. '/entorno_toba.env')) {
try {
$dotenv = Dotenv\Dotenv::create($path_env, 'entorno_toba.env');
$dotenv = Dotenv\Dotenv::create($path_env, 'entorno_toba.env');
$dotenv->load();
//Chequeo que existan las variables correspondientes... deberia pero bue nunca esta de mas.
$dotenv->required('TOBA_INSTANCIA');
$dotenv->required('TOBA_INSTALACION_DIR');
$dotenv->required(['TOBA_INSTANCIA', 'TOBA_INSTALACION_DIR']);
} catch (Dotenv\Exception\ValidationException $e) {
echo 'Falta definir una variable de entorno que es requerida ' . PHP_EOL . $e->getMessage();
}
}
}
}

require_once($_SERVER['TOBA_DIR'].'/php/consola/run.php');
29 changes: 14 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,50 @@
"minimum-stability": "dev",
"prefer-stable" : true,
"require": {
"php" : ">=7.1",
"symfony/yaml": "~3.1",
"php" : ">=7.3",
"symfony/yaml": "~4.4",
"siu/security-multitool": "1.0",
"paragonie/random-lib" : "~2.0",
"siu-toba/rest": "~2.0",
"siu-toba/ssl-cert-utils": "@dev",
"guzzlehttp/guzzle": "~6.3",
"onelogin/php-saml": "~3.1",
"guzzlehttp/guzzle": "~6.5",
"onelogin/php-saml": "~3.4",
"siu-toba/numbers_words": "0.18.0.1",
"guiguiboy/php-cli-progress-bar": "dev-master",
"phpoffice/phpspreadsheet": "^1.0",
"dapphp/securimage": "~3.6",
"rospdf/pdf-php": "~0.12",
"siu-toba/structures_graph": "^1.1.1.1",
"phpmailer/phpmailer": "^6.0",
"phpmailer/phpmailer": "~6.1",
"siu-toba/text_highlighter": "~0.8",
"siu-toba/services_json": "^1.0.3.3",
"siu/arai-json-migrator": "~1.0",
"siu/rdi": "~0.9",
"vlucas/phpdotenv": "~3.1",
"vlucas/phpdotenv": "~3.6",
"ioncube/php-openssl-cryptor": "dev-master",
"siu/manejador-salida-toba" : "^1.0",
"psr/log": "^1.0"
"siu/manejador-salida-toba" : "~1.1",
"psr/log": "^1.1"
},
"require-dev": {
"simpletest/simpletest": "~1.1",
"facebook/webdriver": "^1",
"simpletest/simpletest": "~1.2",
"facebook/webdriver": "^1.0",
"greenlion/php-sql-parser": "@dev",
"siu/arai-cli": "*",
"siu/arai-crypto": "*",
"siu/arai-json-parser": "*",
"siu/arai-json-migrator": "*",
"paragonie/halite": "1.6.0",
"siu/manejador-salida-bootstrap" : "^1.0"
"siu/manejador-salida-bootstrap" : "~1.3"
},
"suggest": {
"siu-toba/jasper": "Permite imprimir reportes via Jasper desde SIU-Toba",
"siu/arai-reportes": "Permite imprimir reportes via un servidor Jasper desde SIU-Toba",
"siu/arai-cli" : "Librería cliente de los componentes ARAI",
"siu/manejador-salida-bootstrap": "Permite generar un marcado HTML responsive",
"simplesamlphp/simplesamlphp": "Permite conectarse a un IDP centralizado (see onelogin)"
"simplesamlphp/simplesamlphp": "Permite conectarse a un IDP centralizado (see onelogin)",
"siu/rdi": "Permite almacenar documentos en un ECM"
},
"conflict": {
"siu/arai-cli": "<2.5.0",
"siu/interfaces-manejador-salida-toba" : ">=1.2.0"
"siu/interfaces-manejador-salida-toba" : "<1.2.0"
},
"bin": ["bin/toba",
"bin/toba_docker"],
Expand Down
Loading

0 comments on commit b6bc1d3

Please sign in to comment.