Commit Graph

1378 Commits

Author SHA1 Message Date
MarkBaker 8026fce4b6 Merge branch 'psr2' into develop 2015-05-20 23:55:46 +01:00
MarkBaker 85692956a7 Close to the end of the psr-2 work, just trends to go 2015-05-20 23:55:01 +01:00
MarkBaker 547d495247 Merge branch 'psr2' into develop 2015-05-20 23:20:16 +01:00
MarkBaker c4ff34dde4 Yet more chunks of psr-2 goodness 2015-05-20 23:19:33 +01:00
MarkBaker 17c644bef6 Merge branch 'psr2' into develop 2015-05-20 19:18:12 +01:00
MarkBaker 0c177b5ea2 We modified another block of files to psr-2, and their jaws dropped when they saw what happened next 2015-05-20 19:17:17 +01:00
MarkBaker b394056b56 Merge branch 'psr2' into develop 2015-05-20 00:21:04 +01:00
MarkBaker 7cd731e416 Feels like all the psr-2 work is finally entering its final lap.... of course, that's only step #1 in the grand roadmap, but it's a start 2015-05-20 00:20:20 +01:00
MarkBaker f94dcb9852 Merge branch 'psr2' into develop 2015-05-18 18:57:39 +01:00
MarkBaker 4648e386f5 Getting close to the end of all this psr-2 goodness now, and beginning to think about splitting to a 1.8 branch and a 1.9 branch, with the 1.9 branch having a minimum PHP version of 5.4, so we can begin improving the code, starting with namespacing and a simple bootstrap for those who don't use composer 2015-05-18 16:39:04 +01:00
Progi1984 066a85d3d2 PSR2 Fixes 2015-05-17 20:00:00 +02:00
Progi1984 004d411772 PSR2 Fixes 2015-05-17 19:33:14 +02:00
Progi1984 004936e35a PSR2 Fixes 2015-05-17 19:26:34 +02:00
Progi1984 b6bc0db105 PSR2 Fixes 2015-05-17 18:34:30 +02:00
Progi1984 576effef30 PSR2 Fixes 2015-05-17 18:10:35 +02:00
Progi1984 09352e3e80 PSR2 Fixes 2015-05-17 15:00:02 +02:00
Progi1984 1d842ed218 PSR2 Fixes 2015-05-17 14:16:53 +02:00
Progi1984 4d65197b03 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 12:12:10 +02:00
Progi1984 6b1764f771 PSR2 Fixes 2015-05-17 12:11:56 +02:00
MarkBaker b531fd487e Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2 2015-05-17 10:23:26 +01:00
MarkBaker f0fdc9430b More PSR-2 work, and eliminate duplicate code in Row/Column dimensions by extension of an abstract Dimension class containing common code/properties 2015-05-17 10:22:51 +01:00
Progi1984 9140e3da2e PSR2 Fixes 2015-05-17 11:22:28 +02:00
MarkBaker 4a6686e2dd Merge branch 'psr2' into develop 2015-05-17 00:48:21 +01:00
MarkBaker 334747867d Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
2015-05-17 00:47:17 +01:00
MarkBaker 1663ef141c More psr-2 changes 2015-05-17 00:16:41 +01:00
MarkBaker 61e81377cb Yet more of the psr-2 work 2015-05-16 23:18:40 +01:00
Progi1984 082fb1b475 PSR2 Fixes 2015-05-16 23:09:31 +02:00
Progi1984 f827a25af2 PSR2 Fixes 2015-05-16 19:00:31 +02:00
Progi1984 1bf5ea414b PSR2 Fixes 2015-05-16 13:04:38 +02:00
MarkBaker 2af5e55f2c Merge branch 'psr2' into develop 2015-05-15 23:42:53 +01:00
MarkBaker 4c8dd00dff More psr-2 goodness 2015-05-15 23:41:50 +01:00
Progi1984 121eccd4c8 PSR-2 : Fixes 2015-05-15 13:36:15 +02:00
Progi1984 5508013569 PSR-2 : Fixes 2015-05-15 13:17:40 +02:00
Progi1984 96f3d0e6ee PSR-2 : Fixes 2015-05-15 12:55:10 +02:00
MarkBaker e18ba38f16 More psr-2 for charts 2015-05-15 09:11:18 +01:00
MarkBaker 1c26425915 Merge branch 'psr2' into develop 2015-05-14 23:51:30 +01:00
MarkBaker 66169af898 PSR-2 coding standards for the charting 2015-05-14 23:50:28 +01:00
MarkBaker 7d9f45c176 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Cell.php
2015-05-13 17:02:34 +01:00
MarkBaker feac76dadf We changed the coding standard to PSR-2, and wow! What happened next was awesome 2015-05-13 17:00:22 +01:00
Progi1984 141a61a908 PSR-2 : Fixes 2015-05-13 13:36:53 +02:00
Progi1984 7d086fdbee PSR-2 : Fixes 2015-05-13 13:15:55 +02:00
Progi1984 2881bca443 PSR-2 : Fixes 2015-05-13 12:27:01 +02:00
MarkBaker 06c1ea78de PSR-2 goodness 2015-05-13 08:32:01 +01:00
Progi1984 d85222b45a PSR2 : Improve Travis Test 2015-05-13 08:02:23 +02:00
Progi1984 e018257896 PSR2 : Improve Travis Test 2015-05-13 08:02:03 +02:00
MarkBaker b057a52377 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop
Conflicts:
	.travis.yml
	composer.json
2015-05-13 01:35:34 +01:00
MarkBaker 4a977f1848 Fixed merge errors 2015-05-13 01:29:12 +01:00
MarkBaker 99b0beb721 Merge branch 'psr2' of https://github.com/PHPOffice/PHPExcel into psr2
Conflicts:
	Classes/PHPExcel/Calculation.php
	Classes/PHPExcel/Shared/CodePage.php
	Classes/PHPExcel/Shared/Date.php
	Classes/PHPExcel/Shared/ZipArchive.php
2015-05-13 00:45:56 +01:00
MarkBaker f7296f58b4 More PSR-2 goodness.... getting there slowly 2015-05-13 00:40:55 +01:00
Progi1984 f37630e938 PSR-2 : Fixes 2015-05-12 17:57:29 +02:00