From 41ed3e67256bd1532ff1a9827de97235d92e4021 Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 6 Oct 2016 16:13:32 +0200 Subject: [PATCH 1/3] docker added --- docker-compose.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..298c003 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,23 @@ +mongo: + image: mongo:3.0.8 + container_name: vegas-cmf-mvc-mongo + command: mongod --smallfiles + expose: + - 27017 + - 28017 + environment: + - AUTH=no + - TERM=xterm-256color + +phpunit: + image: amsdard/phalcon:2.0.8-fpm-5.6 + container_name: vegas-cmf-mvc-phpunit + working_dir: /var/www/html + command: vendor/bin/phpunit + environment: + - TERM=xterm-256color + - MONGO_DB_NAME=vegas_test + links: + - mongo:vegas-cmf-mvc-mongo + volumes: + - ./:/var/www/html From 9e115705978df984a16549215bc1f32fdc57a366 Mon Sep 17 00:00:00 2001 From: matt Date: Wed, 19 Oct 2016 15:52:22 +0200 Subject: [PATCH 2/3] travis.yml and docker file changes --- .travis.yml | 14 ++++++-------- docker-compose.yml | 14 -------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index df01a65..8b5a7fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,21 +2,19 @@ language: php php: - 5.5 + - 5.6 services: - mongodb - - memcached -before_install: - - mysql -e "CREATE DATABASE IF NOT EXISTS vegas_test;" -uroot - - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 - - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list - - sudo apt-get update - - sudo apt-get install mongodb-org-server +env: + global: + - PHALCON_VERSION="phalcon-v2.0.8" + - PATH="$PATH:~/bin" before_script: - phpenv config-add travis/php.ini - - git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b phalcon-v2.0.8 + - git clone -q --depth=1 https://github.com/phalcon/cphalcon.git -b ${PHALCON_VERSION} - (cd cphalcon/ext; export CFLAGS="-g3 -O1 -fno-delete-null-pointer-checks -Wall"; phpize && ./configure --enable-phalcon && make -j4 && sudo make install && phpenv config-add ../unit-tests/ci/phalcon.ini) - curl -s http://getcomposer.org/installer | php - php composer.phar install --dev diff --git a/docker-compose.yml b/docker-compose.yml index 298c003..bb76056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,3 @@ -mongo: - image: mongo:3.0.8 - container_name: vegas-cmf-mvc-mongo - command: mongod --smallfiles - expose: - - 27017 - - 28017 - environment: - - AUTH=no - - TERM=xterm-256color - phpunit: image: amsdard/phalcon:2.0.8-fpm-5.6 container_name: vegas-cmf-mvc-phpunit @@ -16,8 +5,5 @@ phpunit: command: vendor/bin/phpunit environment: - TERM=xterm-256color - - MONGO_DB_NAME=vegas_test - links: - - mongo:vegas-cmf-mvc-mongo volumes: - ./:/var/www/html From d2744ab5b13341e32c74206497119bc04a090c23 Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 18 Nov 2016 15:47:42 +0100 Subject: [PATCH 3/3] event manager set --- src/Application.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Application.php b/src/Application.php index af4f161..f903cf8 100644 --- a/src/Application.php +++ b/src/Application.php @@ -251,7 +251,13 @@ public function handle($uri = null) $dispatcher->setActionName($router->getActionName()); $dispatcher->setParams($router->getParams()); + if ($dispatcher->getEventsManager() == null) { + $eventsManager = new Manager(); + $dispatcher->setEventsManager($eventsManager); + } + if ($di->has('view') && $this->_implicitView) { + $di->get('view')->setEventsManager($dispatcher->getEventsManager()); $di->get('view')->start(); }