Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Adding warning namespace #4836

Merged
merged 179 commits into from
@manuscle

warning namespace is often used.
Also sxBootstrap need this namespace (better than override the plugin)

Tom Shaw and others added some commits
Tom Shaw Add router key to pages & add isActive method to Nav Uri. ca32784
Tom Shaw Nav factory recomended request object inject switch. 9bd6f50
Tom Shaw Minor textual fixes. 2bbea55
Tom Shaw Testing request get path method. 197f9a6
Tom Shaw Added unit test if uri returns active on match. 31a1f79
Tom Shaw Removing test setup not needed and soft tab method. 4ee51b2
Tom Shaw Only add request object if has uri. 33e501f
Tom Shaw If statement spacing. da4ecfe
Tom Shaw Change test name. 6705b52
Tom Shaw Test if page contains correct request instance. 56c390a
Tom Shaw Non matching uri test added. dd03688
Tom Shaw Recomended formatting fixes. 6ae5b18
Tom Shaw Added a soft dependency on request object in isActive method. ca5988b
Tom Shaw Formatting fixes. aadc5d5
@noopable noopable Add test FormElementManager takes creationOptions abf14ab
@noopable noopable Fix FormElementManager can't get the 2nd parameter to instantiate d7fdc9b
Anatoly Marinescu add flag for fallback value dc8748d
Anatoly Marinescu data provider is not static 772356f
Anatoly Marinescu add assert 09bde6f
@leodido leodido fixed signature of loadConstraintReferences #4438 aaa30ed
@weierophinney weierophinney Merge branch 'hotfix/4447' into develop
Close #4447
4061451
@mtymek mtymek extracted route matcher into separate class 105c804
@mtymek mtymek refactored unit tests c2a67db
@mtymek mtymek Renamed to "ConsoleRouteMatcher" 9937784
@mtymek mtymek CS add2a1f
@weierophinney weierophinney Merge branch 'hotfix/4431' into develop
Forward port #4431
a72f163
@ralphschindler ralphschindler PR #4439
Merge branch 'hotfix/4438' of git://github.com/leodido/zf2 into leodido-hotfix/4438
76d3723
@mtymek mtymek protected visibility f8d0c76
@ralphschindler ralphschindler Forward #4439
Merge branch 'leodido-hotfix/4438' into develop
fc735bc
@mtymek mtymek updated docblocks and comments acc4f06
@weierophinney weierophinney Merge branch 'hotfix/4450' into develop
Forward port #4450
0057178
@weierophinney weierophinney Merge branch 'hotfix/4441' into develop
Forward port #4441
76b17d1
@weierophinney weierophinney Merge branch 'hotfix/4435' into develop
Forward port #4435
3869a73
@weierophinney weierophinney Merge branch 'hotfix/4451' into develop
Forward port #4451
7b31b63
@weierophinney weierophinney Merge branch 'feature/4448' into develop
Forward port #4448
2e126cd
@samsonasik samsonasik add group ability to Paginator\Adapter\DbTableGateway abd24cd
@samsonasik samsonasik add unit test 7c5fb50
@samsonasik samsonasik add having 25f1d48
@ralphschindler ralphschindler PR #4427
* added better testing for DbTableGateway paginator
4a18283
@weierophinney weierophinney Merge branch 'hotfix/4454' into develop
Forward port #4454
b8a8e08
@ralphschindler ralphschindler Forward #4304
Merge branch 'fmarquis-master' into develop
e25ff30
@ralphschindler ralphschindler Forward PR #4290
Merge branch 'YannickDa-SqlSetTable' into develop
28354b2
@ralphschindler ralphschindler Forward #4280
Merge branch 'AgentCoop-develop' into develop
1b43cd6
@weierophinney weierophinney Merge branch 'hotfix/3958' into develop
Forward port #3958
aa01d5a
@weierophinney weierophinney Merge branch 'releases/2.2.0rc3' into develop
2.2.0rc3 readiness
aa8405f
@weierophinney weierophinney Merge branch 'version/bump' into develop
Back to dev version

Conflicts:
	README.md
	library/Zend/Version/Version.php
1e737e8
@weierophinney weierophinney Merge branch 'releases/2.2.0' into develop
2.2.0 readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php
38b7965
@weierophinney weierophinney Merge branch 'version/bump' into develop
Conflicts:
	README.md
	library/Zend/Version/Version.php
4578c47
@gag237 gag237 Replacing the magic number for a list of constants in Validator\NotEmpty 8348259
Anatoly Marinescu use flag fallbackValue in ArrayInput c0bcfb1
@gag237 gag237 Replacing in tests magic number in Validator\NotEmpty 2d62d10
@mtymek mtymek RouteMatcherInterface 7afee97
@mtymek mtymek allow injecting custom route matcher to route object d82a70d
@mtymek mtymek test constraints dc03e12
@mtymek mtymek param aliases 685312c
@marc-mabe marc-mabe Cache: Implemented BlackHole adapter 0c6d462
@localheinz localheinz Extend NumberFormat filter 3e9bf9d
@localheinz localheinz Rename Number filter to NumberParse
As suggested by @denixport.
fbc9923
@localheinz localheinz Register NumberParse filter in FilterPluginManager d6be7e0
@marc-mabe marc-mabe Cache: The BlackHole adapter should implement all possible interfaces 289af44
@mtymek mtymek param validators f6d2444
@mtymek mtymek param filters f245eb2
@mtymek mtymek two more tests 4421715
@localheinz localheinz Remove package annotation
As suggested by @samsonasik.
3de4b56
@superdweebie superdweebie Add MERGE_CONFIG event to ModuleManager. Gives a hook that allows con…
…fig keys to be deleted
6e48271
@localheinz localheinz Fix condition bcd3607
Anatoly Marinescu remove debug code d308a5c
@localheinz localheinz Change order of inheritance 07bbb3b
@localheinz localheinz Fix CS 30e0fbb
@ezimuel ezimuel Merge branch 'bakura10-fix-3014' into develop 1e4e84a
@weierophinney weierophinney Merge pull request #4348 from tomshaw/zf4346
Add isActive method Navigation Page Uri.
696b4ff
@weierophinney weierophinney [#4348] Fixed test errors
- Only inject request if it is an HTTP request
- Allow injecting a null value for request in URI page type
d4b20c0
@weierophinney weierophinney [#4348] CS fixes
- indentation
- trailing whitespace
8e072bb
@weierophinney weierophinney Merge branch 'feature/4348' into develop
Close #4348
1bf70a6
@weierophinney weierophinney Merge pull request #4400 from noopable/patch-FormElementManager-withP…
…arams

Ability to get an element with creation options from the FormElementManager
29661d3
@weierophinney weierophinney Merge branch 'feature/4400' into develop
Close #4400
f9b8e02
@weierophinney weierophinney Merge pull request #4401 from tolean/feature/empty_fallback_value
add flag for fallback value
f1214c9
@weierophinney weierophinney Merge branch 'feature/4401' into develop
Close #4401
2aa708b
@weierophinney weierophinney Merge pull request #4449 from mtymek/feature/separate_console_route_m…
…atcher

Console route improvements
0d3044b
@weierophinney weierophinney [#4449] docblock fixes
- Ensured docblock references were correct
0a2538c
@weierophinney weierophinney Merge branch 'feature/4449' into develop
Close #4449
76b7b9c
@localheinz localheinz Fix name of test 228d1a5
@gws gws Add JsonSerializable polyfill for PHP versions less than 5.4.0 5db057e
@ralphschindler ralphschindler Forward #4500
Merge branch 'samsonasik-add/ddl.columnBigInt' into develop
bd6602d
@ralphschindler ralphschindler Foward #4468
Merge branch 'samsonasik-add/ddl.columntext' into develop
8f5b5ac
@ralphschindler ralphschindler Forward to develop #4501
Merge branch 'samsonasik-little.fix.space' into develop
8886d28
@weierophinney weierophinney Merge branch 'hotfix/4470' into develop
Forward port #4470
17a59f0
@weierophinney weierophinney Merge branch 'hotfix/4480' into develop
Forward port #4480
f3d4ebc
@weierophinney weierophinney Merge pull request #4489 from gag237/replaceMagicNumber
Replacing the magic number for a list of constants in Validator\NotEmpty
1d92d81
@weierophinney weierophinney Merge branch 'feature/4489' into develop
Close #4489
9cd2289
@weierophinney weierophinney Merge branch 'hotfix/4494' into develop
Forward port #4494
cfd9c63
@weierophinney weierophinney Merge branch 'hotfix/4497' into develop
Forward port #4497
ce9f6f4
@weierophinney weierophinney Merge branch 'hotfix/4498' into develop
Forward port #4498
996f278
@weierophinney weierophinney Merge branch 'hotfix/4499' into develop
Forward port #4499
c3ad891
@mwillbanks mwillbanks Merge branch 'hotfix/4452' into develop
Forward Port #4452
acda6d9
@mwillbanks mwillbanks Merge branch 'develop' of github.com:zendframework/zf2 into develop efc543e
@weierophinney weierophinney Merge branch 'hotfix/4509' into develop
Forward port #4509
14672b6
@mwillbanks mwillbanks Merge branch 'hotfix/4458' into develop
Forward port #4458
a15c1d7
@weierophinney weierophinney Merge pull request #4510 from localheinz/feature/number-filter
Introduce Zend\I18n\Filter\NumberParse based on Zend\I18n\Filter\NumberFormat
a57bb11
@weierophinney weierophinney Merge branch 'feature/4510' into develop
Close #4510
Fixes #4493
31a5534
@weierophinney weierophinney [#4510] CS fixes
- Move closing paren/opening brace to next line
  - constructor (multi-line definition)
  - if statement (multi-line conditional)
39e621b
@weierophinney weierophinney Merge pull request #4512 from marc-mabe/feature/blackhole-cache-storage
blackhole cache storage adapter
ccbf9f3
@weierophinney weierophinney [#4512] CS fixes
- trailing whitespace
71996ce
@weierophinney weierophinney Merge branch 'feature/4512' into develop
Close #4512
4549dd2
@weierophinney weierophinney Merge branch 'hotfix/4518' into develop
Forward port #4518
e20aab2
@weierophinney weierophinney Merge branch 'hotfix/4522' into develop
Forward port #4522
077eddc
@weierophinney weierophinney Merge branch 'hotfix/4526' into develop
Forward port #4526
ca5944b
@mwillbanks mwillbanks Merge branch 'hotfix/4523' into develop
Forward port #4523
5924a4d
@weierophinney weierophinney Merge branch 'hotfix/4528' into develop
Forward port #4528
87eac0a
@weierophinney weierophinney Merge branch 'hotfix/4529' into develop
Forward port #4529
4462fe7
@weierophinney weierophinney Merge branch 'hotfix/4421' into develop
Forward port #4421
5dc65e0
@weierophinney weierophinney Merge branch 'hotfix/4474' into develop
Forward port #4474
b9d80f0
@gws gws Enhance Zend\Json\Encoder to encode JsonSerializable classes ff34a09
@weierophinney weierophinney Merge branch 'hotfix/4530' into develop
Forward port #4530
7a59d3e
@weierophinney weierophinney Merge pull request #4534 from gwis/feature/jsonserializable-polyfill
Introduce JsonSerializable polyfill and support in Zend\Json\Encoder
cd85bc6
@weierophinney weierophinney Merge branch 'feature/4534' into develop
Close #4534
Resolves #4507
1446551
@weierophinney weierophinney Merge branch 'hotfix/4524' into develop
Forward port #4524
7df360e
@weierophinney weierophinney Merge branch 'hotfix/4539' into develop
Forward port #4539
fd1692a
@weierophinney weierophinney Merge branch 'hotfix/4516' into develop
Forward port #4516
7bbaea9
@weierophinney weierophinney Merge branch 'hotfix/4535' into develop
Forward port #4535
c965345
@weierophinney weierophinney Merge branch 'hotfix/4496' into develop
Forward port #4496
672b83e
@weierophinney weierophinney Merge pull request #4505 from superdweebie/resolve-3823
Give modules the ability to modify application config after their own co...
af70d25
@weierophinney weierophinney Merge branch 'feature/4505' into develop
Close #4505
a1e6eb7
@ezimuel ezimuel Merge branch 'gwis-fix-crypt-retval-check' into develop b782578
@ezimuel ezimuel Merge branch 'EvanDotPro-hotfix/zend-auth-duplicate-code' into develop 3127359
@DASPRiD DASPRiD Merge branch 'bugfix/4556' into develop
Forward port #4556
8d7b06a
@ralphschindler ralphschindler Forward #4588 to develop
Merge branch 'rodsouto-issue_4583' into develop
58f4152
@ralphschindler ralphschindler Forward #4553 to develop
Merge branch 'spiffyjr-patch-3' into develop
331c93d
@weierophinney weierophinney Merge branch 'hotfix/4543' into develop
Forward port #4543
c098767
@weierophinney weierophinney Merge branch 'hotfix/4561' into develop
Forward port #4561
a34f070
@weierophinney weierophinney Merge branch 'hotfix/4566' into develop
Forward port #4566
87f22c1
@ezimuel ezimuel Merge branch 'ralphschindler-feature/db-sql-select-union' into develop e97cc0f
@ralphschindler ralphschindler Forward #4558 to develop
Merge branch 'sarge-ch-master' into develop
4901702
@weierophinney weierophinney Merge branch 'hotfix/4609' into develop
Forward port #4609
ee27f67
@weierophinney weierophinney Fix CS issue
- trailing whitespace
1a41e53
@weierophinney weierophinney Merge branch 'hotfix/4542' into develop
Forward port #4542
58d88d2
@weierophinney weierophinney Merge branch 'hotfix/4546' into develop
Forward port #4546
03aa796
@weierophinney weierophinney Merge branch 'hotfix/4572' into develop
Forward port #4572
e37ab13
@weierophinney weierophinney Merge branch 'hotfix/4581' into develop
Forward port #4581
a999a69
@weierophinney weierophinney Merge branch 'hotfix/4582' into develop
Forward port #4582
cdc039a
@weierophinney weierophinney Merge branch 'hotfix/4595' into develop
Forward port #4595
375d1df
@weierophinney weierophinney Merge branch 'hotfix/4596' into develop
Forward port #4596
d9c9c02
@weierophinney weierophinney Merge branch 'hotfix/4597' into develop
Forward port #4597
fe66f12
@weierophinney weierophinney Break data provider and test case in two
- to fix segfault when running under 5.3.3
817aeb1
@weierophinney weierophinney Merge branch 'hotfix/tests' into develop
Fix test segfaults in Zend\Form tests
8894905
@weierophinney weierophinney Merge branch 'hotfix/4599' into develop
Forward port #4599

Conflicts:
	tests/ZendTest/InputFilter/InputTest.php
3ebc7ec
@weierophinney weierophinney Merge branch 'hotfix/4602' into develop
Forward port #4602
6706565
@weierophinney weierophinney Merge branch 'hotfix/4603' into develop
Forward port #4603
4d80e30
@weierophinney weierophinney Merge branch 'hotfix/4605' into develop
Forward port #4605
9453354
@weierophinney weierophinney Merge branch 'hotfix/4608' into develop
Forward port #4608
d079bac
@weierophinney weierophinney Merge branch 'hotfix/4615' into develop
Forward port #4615
89f0dab
@weierophinney weierophinney Merge branch 'hotfix/4616' into develop
Forward port #4616
cf440b8
@weierophinney weierophinney Merge branch 'hotfix/4617' into develop
Forward port #4617
cfc8455
@weierophinney weierophinney Merge branch 'hotfix/4621' into develop
Forward port #4621
c240d65
@weierophinney weierophinney Merge branch 'hotfix/4628' into develop
Forward port #4628
11ee5b6
@weierophinney weierophinney Merge branch 'hotfix/4562' into develop
Forward port #4562
fe6ea44
@weierophinney weierophinney Fix issue with MVC segfault
- Many thanks to @ircmaxell !!!!
5ebd40c
@weierophinney weierophinney Better fix for PCRE + PHPUnit issue
- Again, thanks to @ircmaxell
6585ef1
@weierophinney weierophinney Better fix for 5.3.3 segfaults
- Added `@return` annotations to data providers and test cases that exhibited
  behavior
- Reverts bd2c6f4 and 817aeb1
478cb76
@ralphschindler ralphschindler Forward #4568 to develop
Merge branch 'pauloelr-zend_db_select_cast_limit_and_offset' into develop
19f56de
@weierophinney weierophinney Merge branch 'hotfix/4465' into develop
Forward port #4465
6d01ad2
@DASPRiD DASPRiD Merge branch 'pull/4622' into develop
Forward port #4622
5310b89
@weierophinney weierophinney Merge branch 'hotfix/4618' into develop
Forward port #4618
c926035
@weierophinney weierophinney Merge branch 'hotfix/4632' into develop
Forward port #4632
f9c443b
@weierophinney weierophinney Merge branch 'hotfix/4634' into develop
Forward port #4634
003eed2
@weierophinney weierophinney Merge branch 'hotfix/4636' into develop
Forward port #4636
7758145
@ezimuel ezimuel Merge branch 'marc-mabe-hotfix/3512' into develop f3a10da
@mwillbanks mwillbanks Merge branch 'hotfix/4630' into develop
Forward port #4630
e911436
@mwillbanks mwillbanks Merge branch 'hotfix/4624' into develop
Forward port #4624
a25de75
@mwillbanks mwillbanks Merge branch 'hotfix/4629' into develop
Forward port #4629
44b73b0
@EvanDotPro EvanDotPro Merge branch 'hotfix/paginator-db-count-subselect' of https://github.…
…com/ralphschindler/zf2 into develop

PR #4641
Closes #4590
Closes #3647
462d3c4
@weierophinney weierophinney Merge branch 'version/bump' into develop
Bump to next dev version

Conflicts:
	README.md
	library/Zend/Version/Version.php
cb09bac
@mwillbanks mwillbanks Merge branch 'hotfix/4652' into develop
Forward port #4652
850ae47
@mwillbanks mwillbanks Merge branch 'hotfix/4665' into develop
Forward Port #4665
d179b1e
@mwillbanks mwillbanks Merge branch 'hotfix/4646' into develop
Forward Port #4646
1372ad5
@mwillbanks mwillbanks Merge branch 'hotfix/4644' into develop
Forward port #4644
99cda48
@mwillbanks mwillbanks Merge branch 'hotfix/4631' into develop
Forward port #4631
b0dfecb
@manuscle manuscle Merge branch 'flash-warning' into develop 6216c0d
@coveralls

Coverage Status

Coverage remained the same when pulling 6216c0d on manuscle:develop into 2c6f269 on zendframework:develop.

@coveralls

Coverage Status

Coverage remained the same when pulling 6216c0d on manuscle:develop into 2c6f269 on zendframework:develop.

@coveralls

Coverage Status

Coverage remained the same when pulling 9ffb5ca on manuscle:develop into 2c6f269 on zendframework:develop.

@weierophinney weierophinney merged commit 9ffb5ca into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.