Permalink
Browse files

Develop (#531)

* Similar way to style buttons

* Simplify the quote default

* Create the cache directory via composer-mkdir

* Add NCSS linter to Grunt

* Add NCSS linter to Grunt part2

* Add NCSS linter to Grunt part3

* Tiny refactoring on module installation

* Switch from IED to NPM because PHANTOMJS failes

* HaltonError for NCSSLint

* Remove the invalid templates for the moment

* Simplify ncsslint task and update depedencies

* Cosmetics for docblock and remove old default alias

* Finally lint all templates against NCSS

* Bump version to 3.2.2

* Simplify the getProvider method

* Set DI parameter to NULL

* Revert "Set DI parameter to NULL"

This reverts commit 861065b.

* Remove PHPBench and use PHPStan for a couple of files

* Make Travis happy

* Disable phpstan for Travis

* Split the gruntfile part1

* Split the gruntfile part2

* Split the gruntfile part3

* Split the gruntfile part4
  • Loading branch information...
redaxmedia committed Aug 25, 2017
1 parent 23b2c18 commit 8445ab6d0aee01ec263114240f4a65de4ae148cf
Showing with 1,265 additions and 1,151 deletions.
  1. +2 −3 .travis.yml
  2. +0 −34 benchs/phpbench/includes/BenchCaseAbstract.php
  3. +0 −90 benchs/phpbench/includes/HashBench.php
  4. +0 −42 benchs/phpbench/includes/bootstrap.php
  5. +0 −12 benchs/provider/hash.json
  6. +1 −2 composer.json
  7. +17 −884 gruntfile.js
  8. +2 −2 includes/Captcha.php
  9. +1 −2 includes/Console/Command/Install.php
  10. +1 −2 includes/Console/Command/Uninstall.php
  11. +1 −1 includes/Controller/Search.php
  12. +6 −6 includes/Mailer.php
  13. +10 −0 includes/Module/Module.php
  14. +1 −1 includes/Reader.php
  15. +1 −1 includes/Server/Host.php
  16. +1 −1 includes/Template/Helper/Client.php
  17. +1 −1 includes/Template/Helper/Direction.php
  18. +1 −1 includes/Template/Helper/Robots.php
  19. +1 −1 includes/Template/Helper/Subset.php
  20. +0 −3 includes/Validator/Alias.php
  21. +1 −2 includes/View/SystemStatus.php
  22. +1 −1 languages/en.json
  23. +1 −1 modules/Ace/Ace.php
  24. +1 −1 modules/Ace/assets/styles/ace.css
  25. +1 −1 modules/Analytics/Analytics.php
  26. +1 −1 modules/Archive/Archive.php
  27. +1 −1 modules/CallHome/CallHome.php
  28. +1 −1 modules/Contact/Contact.php
  29. +1 −1 modules/Demo/Demo.php
  30. +1 −1 modules/DirectoryLister/DirectoryLister.php
  31. +1 −1 modules/Disqus/Disqus.php
  32. +1 −1 modules/Experiments/Experiments.php
  33. +1 −1 modules/FeedGenerator/FeedGenerator.php
  34. +1 −1 modules/FeedReader/FeedReader.php
  35. +1 −1 modules/LightGallery/LightGallery.php
  36. +1 −1 modules/Maps/Maps.php
  37. +1 −1 modules/PageCache/PageCache.php
  38. +1 −1 modules/Preview/Preview.php
  39. +1 −1 modules/Sitemap/Sitemap.php
  40. +1 −1 modules/SitemapXml/SitemapXml.php
  41. +1 −1 modules/SocialSharer/SocialSharer.php
  42. +1 −1 modules/SyntaxHighlighter/SyntaxHighlighter.php
  43. +1 −1 modules/TestDummy/TestDummy.php
  44. +1 −1 modules/Tinymce/Tinymce.php
  45. +1 −1 modules/Validator/Validator.php
  46. +8 −8 package.json
  47. +95 −1 phpstan.neon
  48. +28 −0 tasks/diff_json.js
  49. +26 −0 tasks/format_json.js
  50. +35 −0 tasks/htmlhint.js
  51. +49 −0 tasks/jscs.js
  52. +49 −0 tasks/jshint.js
  53. +50 −0 tasks/jsonlint.js
  54. +61 −0 tasks/ncsslint.js
  55. +55 −0 tasks/phpcs.js
  56. +232 −0 tasks/postcss.js
  57. +42 −0 tasks/rename.js
  58. +83 −0 tasks/shell.js
  59. +35 −0 tasks/svgmin.js
  60. +118 −0 tasks/uglify.js
  61. +148 −0 tasks/webfont.js
  62. +5 −0 templates/admin/assets/styles/_button.css
  63. +0 −1 templates/admin/assets/styles/button.css
  64. +6 −0 templates/default/assets/styles/_button.css
  65. +0 −6 templates/default/assets/styles/button.css
  66. +9 −9 templates/default/assets/styles/content.css
  67. +40 −0 templates/skeleton/assets/styles/_button.css
  68. +1 −0 templates/skeleton/assets/styles/_skeleton.css
  69. +1 −1 templates/skeleton/assets/styles/button.css
  70. +9 −1 templates/skeleton/assets/styles/note.css
  71. +4 −4 tests/phpunit/Module/ModuleTest.php
  72. +2 −3 tests/phpunit/TestCaseAbstract.php
  73. +2 −2 tests/provider/Filesystem/file_read_and_write.json
View
@@ -18,7 +18,7 @@ services:
- postgresql
before_install:
- if [ ${TRAVIS_PHP_VERSION:0:1} == "5" ]; then composer require brianium/paratest 0.13.3 johnkary/phpunit-speedtrap 1.0.1 phpbench/phpbench 0.10.0 phpunit/phpunit 4.8.35 sebastian/phpcpd 2.0.4 phpunit/phpcov 2.0.2 --dev --no-update; fi
- if [ ${TRAVIS_PHP_VERSION:0:1} == "5" ]; then composer require brianium/paratest 0.13.3 johnkary/phpunit-speedtrap 1.0.1 phpunit/phpunit 4.8.35 sebastian/phpcpd 2.0.4 phpunit/phpcov 2.0.2 --dev --no-update; fi
- if [ ${TRAVIS_PHP_VERSION:0:1} != "7" ]; then composer remove phpstan/phpstan --dev --no-update; fi
- composer global require hirak/prestissimo
@@ -30,9 +30,8 @@ install:
- gem install mime-types -v 2.6.2
- gem install mailcatcher
- nvm install 7
- npm install --global ied
- npm install --global grunt-cli
- ied install
- npm install
before_script:
- echo sendmail_path=/usr/bin/env catchmail --smtp-ip 127.0.0.1 --smtp-port 1025 -f test@test.com >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,7 +1,7 @@
{
"name": "redaxmedia/redaxscript",
"description": "A modern, ultra lightweight and rocket fast Content Management System",
"version": "3.2.1",
"version": "3.2.2",
"homepage": "https://redaxscript.com",
"license": "GPL-3.0",
"require":
@@ -16,7 +16,6 @@
"fbourigault/composer-mkdir": "2.0.0",
"johnkary/phpunit-speedtrap": "2.0.0-BETA1",
"mikey179/vfsStream": "1.6.4",
"phpbench/phpbench": "0.13.0",
"phpstan/phpstan": "0.7.0",
"phpunit/phpunit": "6.1.4",
"redaxmedia/tocgen": "4.1.1",
Oops, something went wrong.

0 comments on commit 8445ab6

Please sign in to comment.