Skip to content

Commit

Permalink
ZF3 support
Browse files Browse the repository at this point in the history
* zf3 support (#241)

* Update Renderer.php

* Update PrepareData.php

* - unittests update, removed deprecated method `getMock` (#238)

- also removed deprecated method setExpectedException
- run cs fix
- update composer for cs-fix

* - run cs fix
- update composer doctrine
- datagrid should now work with zf2 and zf3

* added unit tests for nightly

* dropped PHP 5.5 (#242)

* dropped PHP 5.5

* travis allow_failures fix

* doctrine-orm-module composer update (#246)

* composer.json
phpunit changed to min 5.6
doctrine/doctrine-orm-module min 1.1.0
changed autoloader to PSR-4

* cs fixxes

* PHP 7.1 in travis (#247)

* added PHP 7.1 in travis for tests

* coverage check only with PHP 7.0
  • Loading branch information
kokspflanze authored and ThaDafinser committed Oct 21, 2016
1 parent 42cd977 commit 67e643c
Show file tree
Hide file tree
Showing 76 changed files with 1,058 additions and 1,108 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@ language: php
sudo: false

php:
- 5.5
- 5.6
- 7
- 7.1
- hhvm
- nightly

matrix:
allow_failures:
- php: nightly

env:
matrix:
Expand Down
30 changes: 14 additions & 16 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,22 @@
}],

"require": {
"php": "~5.5|~7.0",
"php": "~5.6|~7.0",

"zendframework/zend-mvc": "~2.7",
"zendframework/zend-mvc": "~2.7|~3.0",
"zendframework/zend-modulemanager": "~2.5",
"zendframework/zend-session": "~2.5",
"zendframework/zend-view": "~2.5",
"zendframework/zend-http": "~2.5",
"zendframework/zend-paginator": "~2.5",
"zendframework/zend-cache": "~2.5",
"zendframework/zend-servicemanager": "~2.7"
"zendframework/zend-servicemanager": "~2.7|~3.0"
},

"require-dev": {
"phpunit/phpunit": "^4.8|^5.2",
"phpunit/phpunit": "^5.6.1",
"friendsofphp/php-cs-fixer": "^1.11",

"doctrine/orm": ">=2.5,<2.7",
"doctrine/dbal": ">=2.5,<2.7",
"doctrine/doctrine-orm-module": "^0.9",
"doctrine/doctrine-orm-module": "^1.1.0",

"zendframework/zend-console": "~2.5",
"zendframework/zend-db": "~2.5",
Expand All @@ -53,22 +50,23 @@

"suggest" : {
"ext-intl": "*",

"doctrine/orm": ">=2.5,<2.7",
"doctrine/dbal": ">=2.5,<2.7",
"doctrine/doctrine-orm-module": "^0.9",
"doctrine/doctrine-orm-module": "for doctrine support",

"phpoffice/phpexcel": "^1.8",
"tecnickcom/tcpdf": "^6.2",

"zendframework/zend-text": "~2.5",
"zendframework/zend-json": "to support date ranges"
},

"autoload": {
"psr-0": {
"ZfcDatagrid\\": "src/",
"ZfcDatagridTest\\": "tests/"
"psr-4": {
"ZfcDatagrid\\": "src/ZfcDatagrid"
}
},
"autoload-dev": {
"psr-4": {
"ZfcDatagridTest\\": "tests/ZfcDatagridTest"
}
}
}
23 changes: 7 additions & 16 deletions src/ZfcDatagrid/Action/Mass.php
Original file line number Diff line number Diff line change
@@ -1,31 +1,28 @@
<?php

namespace ZfcDatagrid\Action;

class Mass
{
/**
*
* @var string
*/
private $title = '';

/**
*
* @var string
*/
private $link = '';

/**
*
* @var boolean
* @var bool
*/
private $confirm = false;

/**
*
* @param string $title
* @param string $link
* @param boolean $confirm
* @param string $title
* @param string $link
* @param bool $confirm
*/
public function __construct($title = '', $link = '', $confirm = false)
{
Expand All @@ -35,7 +32,6 @@ public function __construct($title = '', $link = '', $confirm = false)
}

/**
*
* @param string $title
*/
public function setTitle($title)
Expand All @@ -44,7 +40,6 @@ public function setTitle($title)
}

/**
*
* @return string
*/
public function getTitle()
Expand All @@ -53,7 +48,6 @@ public function getTitle()
}

/**
*
* @param string $link
*/
public function setLink($link)
Expand All @@ -62,7 +56,6 @@ public function setLink($link)
}

/**
*
* @return string
*/
public function getLink()
Expand All @@ -71,17 +64,15 @@ public function getLink()
}

/**
*
* @param boolean $mode
* @param bool $mode
*/
public function setConfirm($mode = true)
{
$this->confirm = (bool) $mode;
}

/**
*
* @return boolean
* @return bool
*/
public function getConfirm()
{
Expand Down
Loading

0 comments on commit 67e643c

Please sign in to comment.