Skip to content
This repository has been archived by the owner on Nov 28, 2018. It is now read-only.

fixed code style #12

Open
wants to merge 256 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
256 commits
Select commit Hold shift + click to select a range
768a9ab
Merge branch 'master' of git://github.com/jaredhoyt/cakephp-wizard
Dec 22, 2010
ae7f7c4
Renamed 'wizardAction' attribute to 'action'
Dec 22, 2010
455c707
Better way to retrieve the controller name
Dec 23, 2010
aa12f9a
Made the completion redirect an array for more specific uses (such as…
Dec 23, 2010
cf84595
Instead of triggering an error when reaching a wrong step, jump to th…
Jan 24, 2011
525261a
Adding missing variable to progressMenu.
tomasm- May 7, 2011
9c1818b
CakePHP 2.0 adaptations :
philgagnon12 Feb 20, 2012
9f5fe7c
Merge pull request #1 from philgagnon12/master
Feb 21, 2012
03ebfdf
Merge branch 'patch-1' of https://github.com/tomasm-/cakephp-wizard i…
Feb 21, 2012
835b8fc
Merged mikerogerz fixing #6
Feb 21, 2012
6915c99
Merging master branch from @kindred
Feb 21, 2012
ca79799
Merge branch 'cake1.3'
Feb 21, 2012
bd8e2d2
Update controllers/components/wizard.php
philgagnon12 Feb 21, 2012
8568e53
Update controllers/components/wizard.php
philgagnon12 Feb 21, 2012
0f595c2
Merge pull request #2 from philgagnon12/master
Feb 21, 2012
9d687e1
class WizardComponent extends Component { ... }
philgagnon12 Feb 21, 2012
a72e0a6
Merge branch 'master' of https://github.com/philgagnon12/wizard
Feb 27, 2012
2b22e70
Corrected folder structure to cake2.0 convention
Feb 27, 2012
fbbcd84
$this->params() has been replaced by $this->request in Cake 2.*
destinydriven Jul 7, 2012
f8b92cc
Merge pull request #3 from destinydriven/master
Jul 7, 2012
e4029fc
Update Controller/Component/WizardComponent.php
destinydriven Jul 25, 2012
1c34870
Update View/Helper/WizardHelper.php
destinydriven Jul 25, 2012
cfcb978
Update README.md
destinydriven Jul 25, 2012
966c079
Update README2.md
destinydriven Jul 25, 2012
3e9f1ce
Update README3.md
destinydriven Jul 25, 2012
87abd39
Update README3.md
destinydriven Jul 25, 2012
b0f38eb
Update README4.md
destinydriven Jul 25, 2012
3fea909
Update README5.md
destinydriven Jul 25, 2012
6f333a2
Merge pull request #4 from destinydriven/master
Jul 25, 2012
7a2568e
Updated callback signatures, visibility keywords
destinydriven Sep 4, 2012
e9d9a1a
Merge pull request #5 from destinydriven/master
ProLoser Sep 4, 2012
6663f18
Add roaming option
idev247 Jan 31, 2013
95b12d4
Merge pull request #8 from idev247/master
ProLoser Jan 31, 2013
2e9cbd5
Use NotImplementedException for missing process Callbacks
destinydriven Apr 11, 2013
58d7aef
Merge pull request #9 from destinydriven/master
ProLoser Apr 11, 2013
89d2619
Update README.md
ProLoser Apr 11, 2013
b6cc30e
clean code formating. implements SaveAndBack mode for wizard
skie May 16, 2013
ae628e9
fix cake2 style
skie May 21, 2013
42e3d7a
Adding initial composer.json file
lucasff Feb 15, 2014
d47f6b2
Packagist requires lowercase package names
lucasff Feb 15, 2014
5be2e21
Code reformatting and PHPDoc fixing
lucasff Feb 24, 2014
76fa47e
Code reformatting and PHPDoc fixing
lucasff Feb 24, 2014
05b644c
add return before every redirect()
Mar 17, 2014
e24c1fe
Merge pull request #1 from webcrab/patch-2
Mar 17, 2014
d3205c5
Update README.md
destinydriven Aug 13, 2014
a3ba5e5
Merge remote-tracking branch 'skie/master'
lucasff Aug 22, 2014
f80e450
Merge pull request #15 from destinydriven/master
ProLoser Aug 7, 2015
7462433
Merge pull request #16 from lucasff/master
ProLoser Aug 7, 2015
5a9f441
Update composer.json
ProLoser Aug 7, 2015
6b48868
Merge pull request #2 from ProLoser/master
bancer Nov 24, 2016
a29f3ff
updated gitignore
bancer Nov 24, 2016
54c2aad
Merge pull request #3 from bancer/master
bancer Nov 24, 2016
d014094
updated gitignore and composer
bancer Nov 24, 2016
f93ea88
improved WizardHelper code style
bancer Nov 24, 2016
13a5348
fixed WizardComponent code style
bancer Nov 24, 2016
a7fe70e
fixed code style (#17)
bancer Nov 24, 2016
be67f02
added .travis.yml and a test file
bancer Nov 26, 2016
99f4c1e
improved travis config, removed wrong import
bancer Nov 26, 2016
f3a0d99
added phpcs to travis config
bancer Nov 26, 2016
cff20b8
improved travis config
bancer Nov 26, 2016
4552703
fixed travis phpcs path
bancer Nov 26, 2016
46a9270
improved documentation
bancer Nov 26, 2016
155c873
fixed code style
bancer Nov 26, 2016
3bbfc50
Merge pull request #4 from bancer/2.x
bancer Nov 26, 2016
f6347e8
improved unit test
bancer Nov 26, 2016
b226f87
fixed testInitialize()
bancer Nov 26, 2016
10fc359
fixed unit tests, added code coverage
bancer Nov 26, 2016
080f10f
adjusted coverage config
bancer Nov 26, 2016
05218fc
temporary commented out unused test code
bancer Nov 26, 2016
e77fa06
Merge pull request #5 from bancer/2.x
bancer Nov 26, 2016
4d5e62d
added unit test, adjusted coverage config
bancer Nov 26, 2016
a9dcec6
adjusted unit tests
bancer Nov 26, 2016
fc57720
adjusted coverage config
bancer Nov 26, 2016
132a859
adjusted coverage config
bancer Nov 26, 2016
41817dd
adjusted coverage config
bancer Nov 26, 2016
a84eb1f
adjusted coverage config
bancer Nov 26, 2016
9b5d797
adjusted coverage config
bancer Nov 26, 2016
e762c33
adjusted coverage config
bancer Nov 26, 2016
906c02d
adjusted coverage configuration
bancer Nov 26, 2016
4ff54e8
adjusted coverage configuration
bancer Nov 26, 2016
839853e
Merge pull request #6 from bancer/2.x
bancer Nov 26, 2016
7eb0b08
improved unit test
bancer Nov 26, 2016
9e15878
improved documentation and code style, more unit testing
bancer Nov 27, 2016
5526bb6
fixed typo
bancer Nov 27, 2016
159d3c2
fixed undefined variable
bancer Nov 27, 2016
d427689
fixed unit test
bancer Nov 27, 2016
2f98656
branch() method simplified and unit tested
bancer Nov 27, 2016
747ed88
improved code style
bancer Nov 27, 2016
f945125
Merge pull request #7 from bancer/2.x
bancer Nov 27, 2016
6b906c4
more unit tests
bancer Nov 27, 2016
9ace9e4
more unit tests
bancer Nov 27, 2016
d0f6b0d
fixed unit test
bancer Nov 27, 2016
b44d9a4
fixed unit test
bancer Nov 27, 2016
e22944a
fixed unit test
bancer Nov 27, 2016
8a581e7
adjusted codecov.io call
bancer Nov 27, 2016
0ff7b68
adjusted codecov call
bancer Nov 27, 2016
d188a9f
improved unit test
bancer Nov 27, 2016
c4195f4
improved unit test
bancer Nov 27, 2016
0b113fe
more unit tests
bancer Nov 27, 2016
704de0b
fixed unit test
bancer Nov 27, 2016
c343f49
more unit tests
bancer Nov 27, 2016
1e39bd4
Merge pull request #8 from bancer/2.x
bancer Nov 27, 2016
fd8ead6
improved unit tests
bancer Nov 27, 2016
037c075
improved unit tests
bancer Nov 27, 2016
cc82e84
fixed unit tests
bancer Nov 27, 2016
b8903a5
improved unit tests
bancer Nov 27, 2016
a178da9
improved unit tests
bancer Nov 27, 2016
0ad5e7a
improved unit tests
bancer Nov 27, 2016
1f4595e
simplified unit tests
bancer Nov 27, 2016
2e347be
improved unit tests
bancer Nov 27, 2016
04dbd50
temporary comment out yet unused code
bancer Nov 27, 2016
3a64693
Merge pull request #9 from bancer/2.x
bancer Nov 27, 2016
1de3117
more unit tests
bancer Nov 30, 2016
291c62e
improved code style and unit tests
bancer Nov 30, 2016
62b07fa
improved unit test
bancer Nov 30, 2016
e259475
fixed unit test
bancer Nov 30, 2016
72c2ee6
improved code style, unit tests
bancer Nov 30, 2016
2312872
fixed unit test
bancer Nov 30, 2016
6fc4b55
fixed $this->controller->data, improved unit tests
bancer Nov 30, 2016
107e52a
fixed unit test
bancer Nov 30, 2016
203ef6b
improved unit test
bancer Nov 30, 2016
84602d1
unit tests
bancer Nov 30, 2016
9990162
unit tests
bancer Nov 30, 2016
2d36b2b
more debug
bancer Nov 30, 2016
6e57d25
unit tests
bancer Nov 30, 2016
37da4c6
unit tests
bancer Nov 30, 2016
4ea8052
more debug
bancer Nov 30, 2016
acf6f66
more debug
bancer Nov 30, 2016
970912e
more debug
bancer Nov 30, 2016
83f1c21
more debug
bancer Nov 30, 2016
9ba911e
unit tests
bancer Nov 30, 2016
60477ac
unit tests
bancer Nov 30, 2016
ec581e4
unit tests
bancer Nov 30, 2016
1a386fd
unit tests
bancer Nov 30, 2016
ed0ff50
unit tests
bancer Nov 30, 2016
3031659
unit tests
bancer Nov 30, 2016
327e842
unit tests
bancer Nov 30, 2016
d891861
unit tests
bancer Nov 30, 2016
9b13e6a
unit tests
bancer Nov 30, 2016
42a5400
code style, unit tests
bancer Nov 30, 2016
9b5e05b
fixed unit tests
bancer Nov 30, 2016
0cf33dc
more unit tests
bancer Nov 30, 2016
27bf6c0
added missing import
bancer Nov 30, 2016
57013b3
unit tests
bancer Nov 30, 2016
5e2afb1
unit tests
bancer Nov 30, 2016
a95c233
unit tests
bancer Nov 30, 2016
0faa981
unit tests
bancer Nov 30, 2016
acdac79
unit tests
bancer Nov 30, 2016
5ad4cba
unit tests
bancer Nov 30, 2016
7dd959e
more unit tests
bancer Nov 30, 2016
910e0e6
unit tests
bancer Nov 30, 2016
8a55c1d
unit tests
bancer Nov 30, 2016
86934eb
unit tests
bancer Nov 30, 2016
c8765dc
unit tests
bancer Nov 30, 2016
0ca7055
unit tests
bancer Nov 30, 2016
bac36f0
unit tests
bancer Nov 30, 2016
6bbf5bc
unit tests
bancer Nov 30, 2016
0f97919
unit tests
bancer Nov 30, 2016
a354337
reenable stylecheck
bancer Nov 30, 2016
0ad35f1
fixed code style
bancer Nov 30, 2016
66ce408
Merge pull request #10 from bancer/2.x
bancer Nov 30, 2016
215c999
Merge pull request #11 from bancer/master
bancer Nov 30, 2016
64eb288
Merge pull request #12 from bancer/2.x
bancer Nov 30, 2016
36227bb
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard into
bancer Nov 30, 2016
5dede2b
Merge pull request #14 from bancer/ProLoser-master
bancer Nov 30, 2016
d68af58
Merge pull request #15 from bancer/2.x
bancer Nov 30, 2016
0ba5cba
unit tests added, code style fixed (#18)
bancer Nov 30, 2016
007f8d8
more unit tests
bancer Dec 1, 2016
752c363
fixed code style
bancer Dec 1, 2016
c665854
unit tests
bancer Dec 1, 2016
b9638e1
unit tests
bancer Dec 1, 2016
1ab4e5a
unit tests
bancer Dec 1, 2016
36a4781
unit tests
bancer Dec 1, 2016
7ea1a2f
unit tests
bancer Dec 1, 2016
a903f5f
unit tests
bancer Dec 1, 2016
f30148f
unit tests
bancer Dec 1, 2016
01c9f42
unit tests
bancer Dec 1, 2016
56cb7c1
unit tests
bancer Dec 1, 2016
5a80f68
unit tests
bancer Dec 1, 2016
f468264
unit tests
bancer Dec 1, 2016
34be65e
Merge pull request #16 from bancer/2.x
bancer Dec 1, 2016
4902008
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard into
bancer Dec 1, 2016
7619304
adjusted travis config
bancer Dec 1, 2016
a52cbf9
Merge pull request #18 from bancer/ProLoser-master
bancer Dec 1, 2016
4371a54
Merge pull request #19 from bancer/2.x
bancer Dec 1, 2016
efeaef5
Progress menu links made consistent
bancer Dec 2, 2016
c0ac9b5
humanized steps in the helper
bancer Dec 2, 2016
ea7901c
more unit tests, bugs fixed (#19)
bancer Dec 2, 2016
bf4aadd
Merge pull request #20 from bancer/2.x
bancer Dec 2, 2016
0133f75
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard into
bancer Dec 2, 2016
eab7e84
Merge pull request #21 from bancer/2.x
bancer Dec 2, 2016
bb3d45f
improved redirect link
bancer Dec 2, 2016
1f1f0b4
Merge pull request #22 from bancer/2.x
bancer Dec 2, 2016
304f37f
improved redirect link
bancer Dec 2, 2016
ba9db08
Merge pull request #23 from bancer/2.x
bancer Dec 2, 2016
e5337f2
Progress menu links made consistent and humanized (#20)
bancer Dec 10, 2016
f3c381f
persist url params on redirect
bancer Jan 18, 2017
4319ab5
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard into
bancer Jan 18, 2017
87beb9a
added debug
bancer Jan 18, 2017
01766fe
more debug
bancer Jan 18, 2017
010e3fe
removed debug
bancer Jan 18, 2017
bc495cd
adjusted url in the unit test
bancer Jan 18, 2017
eedc242
more debug
bancer Jan 18, 2017
52e15e0
fixed url parsing in unit test
bancer Jan 18, 2017
f663f27
removed debug
bancer Jan 18, 2017
c7d3ccb
support persistUrlParams in the WizardHelper
bancer Jan 18, 2017
2038bf9
improved persist url params logic
bancer Jan 18, 2017
4fcaa0d
mode debug
bancer Jan 18, 2017
91ee393
minor improvement
bancer Jan 18, 2017
fe0fc45
fixed passed param in the url
bancer Jan 18, 2017
bfc0cd3
removed debug, fixed unit tests
bancer Jan 18, 2017
5d63637
Merge pull request #24 from bancer/2.x
bancer Jan 18, 2017
c9b5377
Wizard root session key is refactored to a configurable component
bancer Feb 20, 2017
ba1f42d
fixed unit test
bancer Feb 20, 2017
33ec312
Merge pull request #25 from bancer/improved-session
bancer Feb 20, 2017
5e9b6e7
Moved sessionRootKey related code from initialize to startup to ease the
bancer Feb 21, 2017
3e1f70d
Setting session keys refactored to a private method.
bancer Feb 21, 2017
f3c2595
Fixed variable name.
bancer Feb 21, 2017
78f30ed
Merge pull request #26 from bancer/improved-session
bancer Feb 21, 2017
96b2409
Merge pull request #27 from bancer/2.x
bancer Feb 21, 2017
a898116
Wizard root session key is refactored to a configurable component var…
bancer Feb 27, 2017
faf6af1
#more unit tests
bancer Mar 8, 2017
9b7c204
adjusted unit tests
bancer Mar 8, 2017
15ca341
better clear session in tests
bancer Mar 8, 2017
e1966d7
unit tests adjusted
bancer Mar 8, 2017
c21d679
unit tests
bancer Mar 8, 2017
e65b739
unit tests improved
bancer Mar 8, 2017
9fdef2e
Some refactoring in order to reduce the number of redirects
bancer Mar 8, 2017
0fb4e4e
more refactoring
bancer Mar 8, 2017
cebb126
more docs and reset the expected step in branch()
bancer Mar 8, 2017
29e05ca
updates expected step after save() and updates steps after unbranch() is
bancer Mar 8, 2017
d36fea2
ensure the current step is set properly
bancer Mar 8, 2017
23d5ff1
Merge branch '2.x' of https://github.com/bancer/cakephp-wizard into
bancer Mar 8, 2017
da08c42
Merge pull request #29 from bancer/redirects-optimization-conflicts
bancer Mar 8, 2017
25760e9
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard i…
bancer Mar 8, 2017
ab2efeb
Merge pull request #30 from bancer/redirects-optimization-conflicts
bancer Mar 8, 2017
58f7f6a
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard into
bancer Mar 8, 2017
358b876
Merge pull request #31 from bancer/redirects-optimization
bancer Mar 8, 2017
f5239cd
Merge pull request #32 from bancer/2.x
bancer Mar 8, 2017
b348094
Fixed indefinite loop bug.
bancer Mar 9, 2017
44d04d1
Merge pull request #33 from bancer/redirects-optimization
bancer Mar 9, 2017
ac03bbc
Merge pull request #34 from bancer/2.x
bancer Mar 9, 2017
db8b6a4
Update WizardComponent.php
mlingureanu Mar 31, 2017
1484bfc
Update WizardComponent.php
mlingureanu Apr 11, 2017
50e80e8
Merge pull request #24 from mlingureanu/master
bancer Apr 19, 2017
4107309
Merge branch 'master' of https://github.com/ProLoser/CakePHP-Wizard
bancer Jun 2, 2017
2a92cb9
used Router::reverseToArray()
bancer Jun 2, 2017
8d2808d
updated cakephp version
bancer Jun 2, 2017
d2eddd3
restored deleted params
bancer Jun 2, 2017
9c1c80c
Merge pull request #35 from bancer/master
bancer Jun 2, 2017
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
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
*~
.DS_Store
.DS_Store
/.buildpath
/.project
/.settings/
/vendor/
/composer.lock
89 changes: 89 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# Thanks cakephp/debug_kit for this file.
language: php

php:
# - 5.5
- 5.6
# - 7.0
# - 7.1

env:
# - CAKE_VERSION=2.8.0 DB=mysql
- CAKE_VERSION=2.9.9 DB=mysql

install:
- git clone git://github.com/cakephp/cakephp ../cakephp && cd ../cakephp && git checkout $CAKE_VERSION
- cp -R ../cakephp-wizard plugins/Wizard
- chmod -R 777 ../cakephp/app/tmp
- sh -c "composer global require 'phpunit/phpunit=3.7.33'"
- sh -c "ln -s ~/.composer/vendor/phpunit/phpunit/PHPUnit ../cakephp/vendors/PHPUnit"
- sh -c "composer global require 'cakephp/cakephp-codesniffer:1.*'"
- sh -c "~/.composer/vendor/bin/phpcs --config-set installed_paths ~/.composer/vendor/cakephp/cakephp-codesniffer"

before_script:
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
- sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
- set +H
- echo "<?php
class DATABASE_CONFIG {
private \$identities = array(
'mysql' => array(
'datasource' => 'Database/Mysql',
'host' => '0.0.0.0',
'login' => 'travis'
),
'pgsql' => array(
'datasource' => 'Database/Postgres',
'host' => '127.0.0.1',
'login' => 'postgres',
'database' => 'cakephp_test',
'schema' => array(
'default' => 'public',
'test' => 'public'
)
)
);
public \$default = array(
'persistent' => false,
'host' => '',
'login' => '',
'password' => '',
'database' => 'cakephp_test',
'prefix' => ''
);
public \$test = array(
'persistent' => false,
'host' => '',
'login' => '',
'password' => '',
'database' => 'cakephp_test',
'prefix' => ''
);
public function __construct() {
\$db = 'mysql';
if (!empty(\$_SERVER['DB'])) {
\$db = \$_SERVER['DB'];
}
foreach (array('default', 'test') as \$source) {
\$config = array_merge(\$this->{\$source}, \$this->identities[\$db]);
if (is_array(\$config['database'])) {
\$config['database'] = \$config['database'][\$source];
}
if (!empty(\$config['schema']) && is_array(\$config['schema'])) {
\$config['schema'] = \$config['schema'][\$source];
}
\$this->{\$source} = \$config;
}
}
}" > ../cakephp/app/Config/database.php

script:
# Temporary disable code style until we have enough unit tests to fix code style errors.
- ~/.composer/vendor/bin/phpcs --standard=CakePHP ./plugins/Wizard --ignore=*/vendor/* -p
- ./lib/Cake/Console/cake test Wizard AllWizard --configuration=./plugins/Wizard/phpunit-clover.xml --stderr

after_success:
- cd ./plugins/Wizard && bash <(curl -s https://codecov.io/bash)

notifications:
email: false
Loading