Permalink
Browse files

Develop (#534)

* Bump version to 3.2.3

* Improve Bootstrap\Common and related testing

* Improve Bootstrap\Common and related testing part2

* Remove protocol relative URLs to fix bad performance under Windows for is_file()

* Fix up and down for the content ranking
  • Loading branch information...
redaxmedia committed Aug 30, 2017
1 parent fffa955 commit 9e121e15c5e879153808a073ebaf990ffd0eab99
Showing with 240 additions and 112 deletions.
  1. +5 −5 composer.json
  2. +10 −2 includes/Bootstrap/Common.php
  3. +2 −0 includes/admin_query.php
  4. +1 −1 languages/en.json
  5. +1 −1 modules/Ace/Ace.php
  6. +1 −1 modules/Analytics/Analytics.php
  7. +1 −1 modules/Archive/Archive.php
  8. +1 −1 modules/CallHome/CallHome.php
  9. +1 −1 modules/Contact/Contact.php
  10. +1 −1 modules/Demo/Demo.php
  11. +1 −1 modules/DirectoryLister/DirectoryLister.php
  12. +1 −1 modules/Disqus/Disqus.php
  13. +1 −1 modules/Experiments/Experiments.php
  14. +1 −1 modules/FeedGenerator/FeedGenerator.php
  15. +1 −1 modules/FeedReader/FeedReader.php
  16. +1 −1 modules/LightGallery/LightGallery.php
  17. +1 −1 modules/Maps/Maps.php
  18. +1 −1 modules/PageCache/PageCache.php
  19. +1 −1 modules/Preview/Preview.php
  20. +1 −1 modules/Sitemap/Sitemap.php
  21. +1 −1 modules/SitemapXml/SitemapXml.php
  22. +1 −1 modules/SocialSharer/SocialSharer.php
  23. +1 −1 modules/SyntaxHighlighter/SyntaxHighlighter.php
  24. +1 −1 modules/TestDummy/TestDummy.php
  25. +1 −1 modules/Tinymce/Tinymce.php
  26. +1 −1 modules/Validator/Validator.php
  27. +4 −4 package.json
  28. +7 −0 phpstan.neon
  29. +0 −6 phpunit.xml
  30. +1 −1 templates/admin/head.phtml
  31. +1 −1 templates/admin/script.phtml
  32. +1 −1 templates/console/head.phtml
  33. +1 −1 templates/console/script.phtml
  34. +1 −1 templates/default/head.phtml
  35. +1 −1 templates/default/script.phtml
  36. +1 −1 templates/install/head.phtml
  37. +1 −1 templates/install/script.phtml
  38. +1 −1 templates/skeleton/head.phtml
  39. +1 −1 templates/skeleton/script.phtml
  40. +129 −14 tests/phpunit/Bootstrap/CommonTest.php
  41. +2 −2 tests/provider/Asset/loader_concat.json
  42. +0 −42 tests/provider/Bootstrap/common.json
  43. +24 −0 tests/provider/Bootstrap/common_client.json
  44. +20 −0 tests/provider/Bootstrap/common_server.json
  45. +2 −2 tests/provider/Head/link_concat.json
  46. +2 −2 tests/provider/Head/script_concat.json
View
@@ -1,7 +1,7 @@
{
"name": "redaxmedia/redaxscript",
"description": "A modern, ultra lightweight and rocket fast Content Management System",
"version": "3.2.2",
"version": "3.2.3",
"homepage": "https://redaxscript.com",
"license": "GPL-3.0",
"require":
@@ -11,13 +11,13 @@
},
"require-dev":
{
"brianium/paratest": "0.14.0",
"brianium/paratest": "1.0.1",
"drupal/coder": "8.2.12",
"fbourigault/composer-mkdir": "2.0.0",
"johnkary/phpunit-speedtrap": "2.0.0-BETA1",
"mikey179/vfsStream": "1.6.4",
"phpstan/phpstan": "0.7.0",
"phpunit/phpunit": "6.1.4",
"mikey179/vfsStream": "1.6.5",
"phpstan/phpstan": "0.8.4",
"phpunit/phpunit": "6.3.0",
"satooshi/php-coveralls": "1.0.1",
"sebastian/phpcpd": "3.0.0",
"slowprog/composer-copy-file": "0.2.0",
@@ -135,12 +135,20 @@ protected function _setModule()
/**
* set php
*
* @since 3.1.0
* @since 3.2.3
*/
protected function _setPhp()
{
$this->_registry->set('phpOs', strtolower(php_uname('s')));
$phpOs = strtolower(php_uname('s'));
if (substr($phpOs, 0, 5) === 'linux')
{
$this->_registry->set('phpOs', 'linux');
}
else if (substr($phpOs, 0, 3) === 'win')
{
$this->_registry->set('phpOs', 'windows');
}
$this->_registry->set('phpVersion', phpversion());
}
}
View
@@ -534,6 +534,8 @@ function admin_process()
function admin_move()
{
$registry = Redaxscript\Registry::getInstance();
$language = Redaxscript\Language::getInstance();
$adminParameter = $registry->get('adminParameter');
$tableParameter = $registry->get('tableParameter');
$idParameter = $registry->get('idParameter');
View
@@ -3,7 +3,7 @@
{
"name": "Redaxscript",
"description": "Ultra lightweight Content Management System",
"version": "3.2.2",
"version": "3.2.3",
"homepage": "https://redaxscript.com"
},
"_index":
View
@@ -28,7 +28,7 @@ class Ace extends Module\Module
'alias' => 'Ace',
'author' => 'Redaxmedia',
'description' => 'JavaScript powered code editor',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -28,7 +28,7 @@ class Analytics extends Module\Module
'alias' => 'Analytics',
'author' => 'Redaxmedia',
'description' => 'Integrate Google Analytics',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class Archive extends Config
'alias' => 'Archive',
'author' => 'Redaxmedia',
'description' => 'Generate a archive tree',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -30,7 +30,7 @@ class CallHome extends Module\Module
'alias' => 'CallHome',
'author' => 'Redaxmedia',
'description' => 'Provide version and news updates',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -32,7 +32,7 @@ class Contact extends Module\Module
'alias' => 'Contact',
'author' => 'Redaxmedia',
'description' => 'Simple contact form',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
View
@@ -30,7 +30,7 @@ class Demo extends Config
'alias' => 'Demo',
'author' => 'Redaxmedia',
'description' => 'Enable demo login',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -31,7 +31,7 @@ class DirectoryLister extends Config
'alias' => 'DirectoryLister',
'author' => 'Redaxmedia',
'description' => 'Simple directory lister',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -28,7 +28,7 @@ class Disqus extends Config
'alias' => 'Disqus',
'author' => 'Redaxmedia',
'description' => 'Replace comments with disqus',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -27,7 +27,7 @@ class Experiments extends Config
'alias' => 'Experiments',
'author' => 'Redaxmedia',
'description' => 'Integrate Google Experiments',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class FeedGenerator extends Module\Module
'alias' => 'FeedGenerator',
'author' => 'Redaxmedia',
'description' => 'Generate Atom feeds from content',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class FeedReader extends Config
'alias' => 'FeedReader',
'author' => 'Redaxmedia',
'description' => 'Read external RSS and Atom feeds',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class LightGallery extends Config
'alias' => 'LightGallery',
'author' => 'Redaxmedia',
'description' => 'Javascript powered light gallery',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
View
@@ -28,7 +28,7 @@ class Maps extends Config
'alias' => 'Maps',
'author' => 'Redaxmedia',
'description' => 'Integrate Google Maps',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -27,7 +27,7 @@ class PageCache extends Config
'alias' => 'PageCache',
'author' => 'Redaxmedia',
'description' => 'Simple page cache',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -30,7 +30,7 @@ class Preview extends Module\Module
'alias' => 'Preview',
'author' => 'Redaxmedia',
'description' => 'Preview template elements',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class Sitemap extends Config
'alias' => 'Sitemap',
'author' => 'Redaxmedia',
'description' => 'Generate a sitemap tree',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -29,7 +29,7 @@ class SitemapXml extends Module\Module
'alias' => 'SitemapXml',
'author' => 'Redaxmedia',
'description' => 'Generate a sitemap XML',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -28,7 +28,7 @@ class SocialSharer extends Config
'alias' => 'SocialSharer',
'author' => 'Redaxmedia',
'description' => 'Integrate a social sharer',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -28,7 +28,7 @@ class SyntaxHighlighter extends Module\Module
'alias' => 'SyntaxHighlighter',
'author' => 'Redaxmedia',
'description' => 'JavaScript powered syntax highlighter',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -27,7 +27,7 @@ class TestDummy extends Module\Module
'alias' => 'TestDummy',
'author' => 'Redaxmedia',
'description' => 'Test Dummy',
'version' => '3.2.2'
'version' => '3.2.3'
];
/**
@@ -27,7 +27,7 @@ class Tinymce extends Config
'alias' => 'Tinymce',
'author' => 'Redaxmedia',
'description' => 'JavaScript powered WYSIWYG editor',
'version' => '3.2.2',
'version' => '3.2.3',
'access' => '1'
];
@@ -27,7 +27,7 @@ class Validator extends Config
'alias' => 'Validator',
'author' => 'Redaxmedia',
'description' => 'HTML validator for developers',
'version' => '3.2.2',
'version' => '3.2.3',
'access' => '1'
];
View
@@ -1,7 +1,7 @@
{
"name": "redaxscript",
"description": "A modern, ultra lightweight and rocket fast Content Management System",
"version": "3.2.2",
"version": "3.2.3",
"homepage": "https://redaxscript.com",
"license": "GPL-3.0",
"author":
@@ -15,7 +15,7 @@
},
"devDependencies":
{
"autoprefixer": "7.1.2",
"autoprefixer": "7.1.3",
"colorguard": "1.2.0",
"cssnano": "3.10.0",
"grunt": "1.0.1",
@@ -36,7 +36,7 @@
"icomoon-free-npm": "0.0.0",
"load-grunt-tasks": "3.5.2",
"material-design-icons": "3.0.1",
"postcss": "6.0.9",
"postcss": "6.0.10",
"postcss-color-function": "4.0.0",
"postcss-color-gray": "4.0.0",
"postcss-custom-media": "6.0.0",
@@ -45,7 +45,7 @@
"postcss-extend": "1.0.5",
"postcss-harmonize": "2.1.1",
"postcss-import": "10.0.0",
"postcss-nesting": "4.0.1",
"postcss-nesting": "4.1.0",
"postcss-reporter": "5.0.0",
"stylefmt": "6.0.0",
"stylelint": "8.0.0",
View
@@ -2,6 +2,7 @@ parameters:
bootstrap: includes\bootstrap.php
excludes_analyse:
- includes/Admin/View
- includes/Asset/Transport.php
- includes/Bootstrap/Cache.php
- includes/Bootstrap/Common.php
- includes/Bootstrap/Content.php
@@ -10,6 +11,7 @@ parameters:
- includes/Bootstrap/Status.php
- includes/Console/Command/Backup.php
- includes/Console/Command/Cache.php
- includes/Console/Command/CommandAbstract.php
- includes/Console/Command/Config.php
- includes/Console/Command/Help.php
- includes/Console/Command/Install.php
@@ -19,6 +21,7 @@ parameters:
- includes/Console/Command/Uninstall.php
- includes/Console/Console.php
- includes/Console/ConsoleAbstract.php
- includes/Console/Parser.php
- includes/Content/Tag/Module.php
- includes/Content/Tag/Readmore.php
- includes/Content/Parser.php
@@ -35,6 +38,7 @@ parameters:
- includes/Filesystem/Cache.php
- includes/Filesystem/Filesystem.php
- includes/Head/Link.php
- includes/Head/Meta.php
- includes/Head/Script.php
- includes/Head/Style.php
- includes/Html/Form.php
@@ -62,6 +66,8 @@ parameters:
- includes/View/RegisterForm.php
- includes/View/ResetForm.php
- includes/View/ResultList.php
- includes/View/SearchForm.php
- includes/View/SystemStatus.php
- includes/admin_admin.php
- includes/admin_list.php
- includes/admin_query.php
@@ -73,6 +79,7 @@ parameters:
- includes/Config.php
- includes/contents.php
- includes/Db.php
- includes/Hash.php
- includes/Installer.php
- includes/Mailer.php
- includes/Messenger.php
View
@@ -220,12 +220,6 @@
<file>tests/phpunit/MessengerTest.php</file>
</testsuite>
<!-- purifier -->
<testsuite name="purifier">
<file>tests/phpunit/PurifierTest.php</file>
</testsuite>
<!-- registry -->
<testsuite name="registry">
@@ -6,7 +6,7 @@
<?php Tag::link()
->init('admin')
->appendFile('//fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700&amp;subset=' . Helper::getSubset())
->appendFile('https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700&amp;subset=' . Helper::getSubset())
->appendFile('templates/admin/dist/styles/admin.min.css')
->rewrite(
[
@@ -5,7 +5,7 @@
<?php if (Tag::getRegistry('loggedIn') === Tag::getRegistry('token') && Tag::getRegistry('firstParameter') !== 'logout'): ?>
<?php Tag::script()
->init('foot')
->appendFile('//cdnjs.cloudflare.com/ajax/libs/speakingurl/13.0.0/speakingurl.min.js')
->appendFile('https://cdnjs.cloudflare.com/ajax/libs/speakingurl/13.0.0/speakingurl.min.js')
->appendFile('templates/admin/assets/scripts/init.js')
->appendFile('templates/admin/dist/scripts/admin.min.js');
?>
@@ -24,7 +24,7 @@
->init()
->append(['href' => 'templates/default/assets/images/favicon.ico', 'rel' => 'shortcut icon'])
->append(['href' => 'templates/default/assets/images/favicon.png', 'rel' => 'apple-touch-icon'])
->appendFile('//fonts.googleapis.com/css?family=Ubuntu+Mono:400&amp;subset=' . Helper::getSubset())
->appendFile('https://fonts.googleapis.com/css?family=Ubuntu+Mono:400&amp;subset=' . Helper::getSubset())
->appendFile('dist/styles/base.min.css')
->appendFile('templates/console/dist/styles/console.min.css')
->concat(); ?>
@@ -5,6 +5,6 @@
<?php echo Tag::script()
->init('foot')
->prependFile('assets/scripts/fallback.js')
->prependFile('//ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js')
->prependFile('https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js')
->appendFile('templates/console/dist/scripts/console.min.js')
->concat(); ?>
Oops, something went wrong.

0 comments on commit 9e121e1

Please sign in to comment.