- refactoring

- default user entity changed to small-user - added unit-tests [basics]
kokspflanze · Apr 4, 2015 · 929ef68 · 929ef68
1 parent 5013192
commit 929ef68
Show file tree

Hide file tree

Showing 33 changed files with 1,454 additions and 946 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-INSTALL.txt
-LICENSE.txt
-README.txt
-demos/
-extras/documentation
+composer.phar
+composer.lock
+.*
+!.gitignore
+!.travis.yml
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,26 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7
+  - hhvm
+  - hhvm-nightly
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm
+    - php: hhvm-nightly
+
+before_script:
+  - composer update --prefer-source --dev
+
+script:
+  - mkdir -p build/logs
+  # Run tests
+  - php ./vendor/bin/phpunit --configuration tests/phpunit.xml
+
+after_script:
+  - php vendor/bin/coveralls -v
diff --git a/README.md b/README.md
@@ -1,5 +1,8 @@
-ZfcTicketSystem
-===============
+# ZfcTicketSystem
+
+Master
+[![Build Status](https://travis-ci.org/kokspflanze/ZfcTicketSystem.svg?branch=master)](https://travis-ci.org/kokspflanze/ZfcTicketSystem?branch=master)
+[![Coverage Status](https://coveralls.io/repos/kokspflanze/ZfcTicketSystem/badge.svg?branch=master)](https://coveralls.io/r/kokspflanze/ZfcTicketSystem?branch=master)
 
 - run the SQL script [db/dump.sql]
 

diff --git a/composer.json b/composer.json
@@ -1,27 +1,37 @@
 {
-	"name": "kokspflanze/zfc-ticket-system",
-	"description": "ZendFramework 2 TicketSystem Module",
-	"type": "library",
-	"keywords": [
-		"framework",
-		"zf2",
-		"twig",
-		"ticketsystem"
-	],
-	"homepage": "https://github.com/kokspflanze/ZfcTicketSystem",
-	"autoload": {
-		"psr-0": {
-			"ZfcTicketSystem\\": "src/"
-		}
-	},
-	"authors": [
-		{
-			"name": "Oliver"
-		}
-	],
-	"require": {
-		"php": ">=5.4",
-		"doctrine/doctrine-orm-module": "0.*",
-		"zf-commons/zfc-user-doctrine-orm": "0.*"
-	}
+  "name": "kokspflanze/zfc-ticket-system",
+  "description": "ZendFramework 2 TicketSystem Module",
+  "type": "library",
+  "keywords": [
+    "framework",
+    "zf2",
+    "twig",
+    "ticketsystem"
+  ],
+  "homepage": "https://github.com/kokspflanze/ZfcTicketSystem",
+  "autoload": {
+    "psr-0": {
+      "ZfcTicketSystem\\": "src/",
+      "ZfcTicketSystemTest\\": "tests/"
+    }
+  },
+  "authors": [
+    {
+      "name": "Oliver",
+      "email": "kokspflanze@gmx.de"
+    }
+  ],
+  "require": {
+    "php": ">=5.4",
+    "doctrine/doctrine-orm-module": "0.*",
+    "zf-commons/zfc-user-doctrine-orm": "0.*",
+    "kokspflanze/small-user": "dev-master"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.0",
+    "zendframework/zendframework": "~2.4",
+    "fabpot/php-cs-fixer": "~1.0",
+    "satooshi/php-coveralls": "dev-master",
+    "phpunit/phpcov": "~2.0"
+  }
 }
diff --git a/config/module.config.php b/config/module.config.php
@@ -70,6 +70,7 @@
 			'ticket_category' => 'ZfcTicketSystem\Entity\TicketCategory',
 			'ticket_entry' => 'ZfcTicketSystem\Entity\TicketEntry',
 			'ticket_subject' => 'ZfcTicketSystem\Entity\TicketSubject',
+            'user' => 'SmallUser\Entity\User'
 		],
 	],
 ];
diff --git a/src/ZfcTicketSystem/Controller/AdminController.php b/src/ZfcTicketSystem/Controller/AdminController.php
@@ -4,42 +4,46 @@
 
 use ZfcTicketSystem\Entity\TicketSubject;
 
-class AdminController extends BaseController {
-
-	public function indexAction(){
-		$type = $this->params()->fromRoute('type');
-
-		return array(
-			'ticketList' => $this->getTicketService()->getTickets4Type($type)
-		);
-	}
-
-	public function viewAction(){
-		$ticketId = $this->params()->fromRoute('id');
-		$ticketSubject = $this->getTicketService()->getTicketSubject4Admin($ticketId);
-		// Fallback if not task
-		if(!$ticketSubject){
-			return $this->redirect()->toRoute('zfc-ticketsystem-admin', array('type' => 0));
-		}
-
-		$form = $this->getTicketService()->getTicketSystemEntryForm();
-
-		$request = $this->getRequest();
-		if($request->isPost()){
-			$ticketSubject->setType(TicketSubject::TypeOpen);
-			$oTicketSystem = $this->getTicketService()->newEntry($this->params()->fromPost(), $this->getAuthService()->getIdentity(), $ticketSubject);
-			if($oTicketSystem){
-				return $this->redirect()->toRoute('zfc-ticketsystem-admin', array('id' => $ticketId, 'action' => 'view'));
-			}
-		}
-
-		$entry = $ticketSubject->getTicketEntry();
-
-		return array(
-			'form' => $form,
-			'ticket' => $ticketSubject,
-			'entry' => $entry
-		);
-	}
+class AdminController extends BaseController
+{
+
+    public function indexAction()
+    {
+        $type = $this->params()->fromRoute( 'type' );
+
+        return array(
+            'ticketList' => $this->getTicketService()->getTickets4Type( $type )
+        );
+    }
+
+    public function viewAction()
+    {
+        $ticketId      = $this->params()->fromRoute( 'id' );
+        $ticketSubject = $this->getTicketService()->getTicketSubject4Admin( $ticketId );
+        // Fallback if not task
+        if (!$ticketSubject) {
+            return $this->redirect()->toRoute( 'zfc-ticketsystem-admin', array( 'type' => 0 ) );
+        }
+
+        $form = $this->getTicketService()->getTicketSystemEntryForm();
+
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            $ticketSubject->setType( TicketSubject::TYPE_OPEN );
+            $oTicketSystem = $this->getTicketService()->newEntry( $this->params()->fromPost(), $this->getAuthService()->getIdentity(),
+                $ticketSubject );
+            if ($oTicketSystem) {
+                return $this->redirect()->toRoute( 'zfc-ticketsystem-admin', array( 'id' => $ticketId, 'action' => 'view' ) );
+            }
+        }
+
+        $entry = $ticketSubject->getTicketEntry();
+
+        return array(
+            'form'   => $form,
+            'ticket' => $ticketSubject,
+            'entry'  => $entry
+        );
+    }
 
 } 
diff --git a/src/ZfcTicketSystem/Controller/BaseController.php b/src/ZfcTicketSystem/Controller/BaseController.php
@@ -4,32 +4,35 @@
 
 use Zend\Mvc\Controller\AbstractActionController;
 
-class BaseController extends AbstractActionController {
-	/** @var \ZfcTicketSystem\Service\TicketSystem */
-	protected $ticketService;
-	/** @var \Zend\Authentication\AuthenticationService */
-	protected $authService;
+class BaseController extends AbstractActionController
+{
+    /** @var \ZfcTicketSystem\Service\TicketSystem */
+    protected $ticketService;
+    /** @var \Zend\Authentication\AuthenticationService */
+    protected $authService;
 
-	/**
-	 * @return \ZfcTicketSystem\Service\TicketSystem
-	 */
-	protected function getTicketService(){
-		if (!$this->ticketService) {
-			$this->ticketService = $this->getServiceLocator()->get('zfcticketsystem_ticketsystem_service');
-		}
+    /**
+     * @return \ZfcTicketSystem\Service\TicketSystem
+     */
+    protected function getTicketService()
+    {
+        if (!$this->ticketService) {
+            $this->ticketService = $this->getServiceLocator()->get( 'zfcticketsystem_ticketsystem_service' );
+        }
 
-		return $this->ticketService;
-	}
+        return $this->ticketService;
+    }
 
-	/**
-	 * @return \Zend\Authentication\AuthenticationService
-	 */
-	protected function getAuthService() {
-		if (!$this->authService) {
-			$config = $this->getServiceLocator()->get('Config');
-			$this->authService = $this->getServiceLocator()->get($config['zfc-ticket-system']['auth_service']);
-		}
+    /**
+     * @return \Zend\Authentication\AuthenticationService
+     */
+    protected function getAuthService()
+    {
+        if (!$this->authService) {
+            $config            = $this->getServiceLocator()->get( 'Config' );
+            $this->authService = $this->getServiceLocator()->get( $config['zfc-ticket-system']['auth_service'] );
+        }
 
-		return $this->authService;
-	}
+        return $this->authService;
+    }
 } 
diff --git a/src/ZfcTicketSystem/Controller/TicketSystemController.php b/src/ZfcTicketSystem/Controller/TicketSystemController.php
@@ -8,63 +8,66 @@
 class TicketSystemController extends BaseController
 {
 
-	public function indexAction()
+    public function indexAction()
     {
-		$view = new ViewModel(array(
-			'ticketList' => $this->getTicketService()->getTickets4User($this->getLoggedInUserId())
-		));
-		$view->setTemplate('zfc-ticket-system/index');
-		return $view;
-	}
-
-	public function newAction(){
-
-		$form = $this->getTicketService()->getTicketSystemNewForm();
-
-		$request = $this->getRequest();
-		if($request->isPost()){
-			$ticketSystem = $this->getTicketService()->newTicket($this->params()->fromPost(), $this->getAuthService()->getIdentity());
-			if($ticketSystem){
-				return $this->redirect()->toRoute('zfc-ticketsystem');
-			}
-		}
-		$view = new ViewModel(array('form' => $form));
-		$view->setTemplate('zfc-ticket-system/new');
-
-		return $view;
-	}
-
-	public function viewAction()
+        $view = new ViewModel( array(
+            'ticketList' => $this->getTicketService()->getTickets4User( $this->getLoggedInUserId() )
+        ) );
+        $view->setTemplate( 'zfc-ticket-system/index' );
+
+        return $view;
+    }
+
+    public function newAction()
+    {
+
+        $form = $this->getTicketService()->getTicketSystemNewForm();
+
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            $ticketSystem = $this->getTicketService()->newTicket( $this->params()->fromPost(), $this->getAuthService()->getIdentity() );
+            if ($ticketSystem) {
+                return $this->redirect()->toRoute( 'zfc-ticketsystem' );
+            }
+        }
+        $view = new ViewModel( array( 'form' => $form ) );
+        $view->setTemplate( 'zfc-ticket-system/new' );
+
+        return $view;
+    }
+
+    public function viewAction()
     {
-		$ticketId = $this->params()->fromRoute('id');
-		$ticketSubject = $this->getTicketService()->getTicketSubject($this->getLoggedInUserId(), $ticketId);
-		// Fallback if not task
-		if(!$ticketSubject){
-			return $this->redirect()->toRoute('zfc-ticketsystem');
-		}
-
-		$form = $this->getTicketService()->getTicketSystemEntryForm();
-
-		$request = $this->getRequest();
-		if($request->isPost()){
-			$ticketSubject->setType(TicketSubject::TypeNew);
-			$ticketSystem = $this->getTicketService()->newEntry($this->params()->fromPost(), $this->getAuthService()->getIdentity(), $ticketSubject);
-			if($ticketSystem){
-				return $this->redirect()->toRoute('zfc-ticketsystem', array('id' => $ticketId, 'action' => 'view'));
-			}
-		}
-
-		$entry = $ticketSubject->getTicketEntry();
-
-		$view = new ViewModel(array(
-			'form' => $form,
-			'ticket' => $ticketSubject,
-			'entry' => $entry
-		));
-		$view->setTemplate('zfc-ticket-system/view');
-
-		return $view;
-	}
+        $ticketId      = $this->params()->fromRoute( 'id' );
+        $ticketSubject = $this->getTicketService()->getTicketSubject( $this->getLoggedInUserId(), $ticketId );
+        // Fallback if not task
+        if (!$ticketSubject) {
+            return $this->redirect()->toRoute( 'zfc-ticketsystem' );
+        }
+
+        $form = $this->getTicketService()->getTicketSystemEntryForm();
+
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            $ticketSubject->setType( TicketSubject::TYPE_NEW );
+            $ticketSystem = $this->getTicketService()->newEntry( $this->params()->fromPost(), $this->getAuthService()->getIdentity(),
+                $ticketSubject );
+            if ($ticketSystem) {
+                return $this->redirect()->toRoute( 'zfc-ticketsystem', array( 'id' => $ticketId, 'action' => 'view' ) );
+            }
+        }
+
+        $entry = $ticketSubject->getTicketEntry();
+
+        $view = new ViewModel( array(
+            'form'   => $form,
+            'ticket' => $ticketSubject,
+            'entry'  => $entry
+        ) );
+        $view->setTemplate( 'zfc-ticket-system/view' );
+
+        return $view;
+    }
 
     /**
      * @return int