Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

v1.1 #33

Merged
merged 42 commits into from
Dec 18, 2014
Merged

v1.1 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
26ded46
crud autotemplating sample for testing purposes
arius86 Nov 27, 2014
7c1328d
CRUD methods - removed final, added auto-redirect
arius86 Nov 27, 2014
3e8cb96
fine tuning of crud
arius86 Nov 27, 2014
3a47c7b
fine tuning of crud
arius86 Nov 27, 2014
4424c08
CRUD forwarding instead picking views
arius86 Nov 27, 2014
9e1826f
View in local variable to prevent seg fault with too much DI referenc…
arius86 Nov 27, 2014
e925937
Merge branch 'master' into v1.1
arius86 Nov 29, 2014
aecce20
CRUD finished (tests yet to come)
arius86 Dec 1, 2014
950e6af
Paginator refactoring
arius86 Dec 1, 2014
fed205a
CRUD index template quick fix
arius86 Dec 1, 2014
7b66051
fix index template for crud
arius86 Dec 2, 2014
dc3992c
simple dateTime mapping for timestamp field
arius86 Dec 2, 2014
cdff503
temp dateTime format change
arius86 Dec 2, 2014
9cdd2fd
crud show template fix
arius86 Dec 2, 2014
a6a271f
crud show template fix
arius86 Dec 2, 2014
273136b
CRUD: separate show and index fields, add show button to index.volt
arius86 Dec 2, 2014
9b9f463
- Module/ModuleLoader renamed to Module/Loader
arius86 Dec 2, 2014
9c7a029
Merge branch 'master' into v1.1
arius86 Dec 3, 2014
e9c17c3
Volt traits fixes;
szytko Dec 3, 2014
4ce3d42
Merge pull request #1 from arius86/v1.1
szytko Dec 3, 2014
340ba9f
Added Route tests;
szytko Dec 3, 2014
6dde762
Merge branch 'v1.1' of https://github.com/szytko/core into v1.1
szytko Dec 3, 2014
b5be1b8
Added Route, Adapter\Standard tests;
szytko Dec 3, 2014
acbc897
CRUD tests working properly, added external Module loading example an…
arius86 Dec 4, 2014
898029e
Added route tests
szytko Dec 4, 2014
24d191b
Merge pull request #2 from arius86/v1.1
szytko Dec 5, 2014
95f634d
Router tests;
szytko Dec 5, 2014
8c60a9f
Refactoring; Db tests;
szytko Dec 5, 2014
fc0e075
Refactoring; Added Vegas\Test; Bootstrap rewriting;
szytko Dec 10, 2014
9fe5559
Bootstrap rewrite; General refactoring; Added Vegas\Test tools; Tests…
szytko Dec 11, 2014
87abf5a
added clearfix for default crud form-groups
arius86 Dec 12, 2014
1cee11c
I18n service fix; Updated config;
szytko Dec 12, 2014
cb1c250
Merge remote-tracking branch 'arius/v1.1' into v1.1
szytko Dec 12, 2014
06c1705
Added volt tests;
szytko Dec 12, 2014
5e04e0c
Refactoring; View tests;
szytko Dec 15, 2014
6fcb0b4
DbRef tests;
szytko Dec 16, 2014
ce4f68c
Added Db helpers tests, Mongo mapper tests, Scaffolding mongo adapter…
szytko Dec 16, 2014
5281e00
Bootstrap tests + little refactoring; Removed Http\Response\Json; CLI…
szytko Dec 16, 2014
b1f8ca5
Cli refactoring + tests; Added DateTime util; Rewritten DateTime db m…
szytko Dec 17, 2014
b304550
Cli refactoring + tests; Added DateTime util; Rewritten DateTime db m…
szytko Dec 17, 2014
8c0ee75
Updated @author tag
szytko Dec 17, 2014
fa8872d
Added Scaffolding Mysql adapter tests; Removed BeforeException class;…
szytko Dec 17, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ com_crashlytics_export_strings.xml
/vendor/
composer.phar
composer.lock
travis.log
travis.log
tests/config.php
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ before_script:
- php composer.phar install --dev

script:
- cp tests/config.sample.php tests/config.php
- mkdir -p tests/fixtures/cache
- mkdir -p tests/fixtures/tmp
- mkdir -p build/logs
- php vendor/bin/phpunit -c travis/phpunit.xml.dist

Expand Down
236 changes: 0 additions & 236 deletions src/Application/Bootstrap.php

This file was deleted.

40 changes: 40 additions & 0 deletions src/Bootstrap/EnvironmentInitializerTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?php
/**
* @author Sławomir Żytko <slawek@amsterdam-standard.pl>
* @copyright (c) 2014, Amsterdam Standard
*/

namespace Vegas\Bootstrap;

use Phalcon\Config;
use Vegas\Constants;

trait EnvironmentInitializerTrait
{

/**
* Initializes application environment
*/
public function initEnvironment(Config $config)
{
if (isset($config->application) && isset($config->application->environment)) {
$env = $config->application->environment;
} else {
$env = Constants::DEFAULT_ENV;
}

if (!defined('APPLICATION_ENV')) {
define('APPLICATION_ENV', $env);
}

$this->getDI()->set('environment', function() use ($env) {
return $env;
}, true);
}

/**
* @return mixed
*/
abstract public function getDI();
}

37 changes: 37 additions & 0 deletions src/Bootstrap/LoaderInitializerTrait.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php
/**
* This file is part of Vegas package
*
* @author Slawomir Zytko <slawek@amsterdam-standard.pl>
* @copyright Amsterdam Standard Sp. Z o.o.
* @homepage http://vegas-cmf.github.io
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Vegas\Bootstrap;

use Phalcon\Config;
use Phalcon\Loader;

trait LoaderInitializerTrait
{

/**
* Initializes loader
* Registers library and plugin directory
*/
public function initLoader(Config $config)
{
$loader = new Loader();
$loader->registerDirs(
array(
$config->application->libraryDir,
$config->application->pluginDir,
$config->application->taskDir
)
)->register();
}
}

Loading