Skip to content
This repository was archived by the owner on Apr 2, 2019. It is now read-only.

Commit 8a728a8

Browse files
kalebheitzmankalebheitzman
committed
Merge branch 'release/1.0.6'
2 parents 1123a8d + 66cb454 commit 8a728a8

35 files changed

+2497
-146
lines changed

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# v1.0.6
2+
## 08/18/2016
3+
1 [](#improved)
4+
* Updated code documentation
5+
* Updated vendor packages
6+
1 [](#bugfix)
7+
* Fixed Issue #6 & Issue #7- tag structure (deleted tabs v1.0.0, v1.0.1, v1.0.2)
8+
19
# v1.0.5
210
## 07/04/2016
311
1 [](#bugfix)

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Date tools plugin for Grav CMS
22

3-
*This plugin works with Grav v1.1.0-rc.3 and above.*
3+
*This plugin works with Grav v1.1.3 and above.*
44

55
This [Grav](http://getgrav.org) plugin provides date tools to use inside of Twig for filtering pages. With the release of Grav 0.9.13 `startDate` and `endDate` were introduced to collection parsing. You can use the following `datetools` to set various dates for retrieving [collections.](http://learn.getgrav.org/content/collections)
66

‎blueprints.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Date Tools
2-
version: 1.0.5
2+
version: 1.0.6
33
description: "This plugin provides date tools to twig inside of Grav CMS using the [Carbon](https://github.com/briannesbitt/Carbon) DateTime api extension."
44
icon: clock-o
55
author:

‎classes/datetools.php

+18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
<?php
2+
/**
3+
* Grav DateTools Plugin
4+
*
5+
* The DateTools Plugin provides provides date tools to use inside of Twig
6+
* for filtering pages. With the release of Grav 0.9.13 `startDate` and
7+
* `endDate` were introduced to collection parsing. You can use the
8+
* following `datetools` to set various dates for retrieving collections.
9+
*
10+
* PHP version 5.6+
11+
*
12+
* @package DateTools
13+
* @author Kaleb Heitzman <[email protected]>
14+
* @copyright 2016 Kaleb Heitzman
15+
* @license https://opensource.org/licenses/MIT MIT
16+
* @version 1.0.6
17+
* @link https://github.com/kalebheitzman/grav-plugin-datetools
18+
* @since 1.0.0 Initial Release
19+
*/
220

321
namespace Grav\Plugin;
422

‎datetools.php

+53-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,50 @@
11
<?php
2+
/**
3+
* Grav DateTools Plugin
4+
*
5+
* The DateTools Plugin provides provides date tools to use inside of Twig
6+
* for filtering pages. With the release of Grav 0.9.13 `startDate` and
7+
* `endDate` were introduced to collection parsing. You can use the
8+
* following `datetools` to set various dates for retrieving collections.
9+
*
10+
* PHP version 5.6+
11+
*
12+
* @package DateTools
13+
* @author Kaleb Heitzman <[email protected]>
14+
* @copyright 2016 Kaleb Heitzman
15+
* @license https://opensource.org/licenses/MIT MIT
16+
* @version 1.0.6
17+
* @link https://github.com/kalebheitzman/grav-plugin-datetools
18+
* @since 1.0.0 Initial Release
19+
*/
220

321
namespace Grav\Plugin;
422

523
use Grav\Common\Plugin;
624

25+
/**
26+
* DateTools Class
27+
*
28+
* The DateTools Plugin provides provides date tools to use inside of Twig
29+
* for filtering pages. With the release of Grav 0.9.13 `startDate` and
30+
* `endDate` were introduced to collection parsing. You can use the
31+
* following `datetools` to set various dates for retrieving collections.
32+
*
33+
* @package DateTools
34+
* @author Kaleb Heitzman <[email protected]>
35+
* @version 1.0.6
36+
* @since 1.0.0 Initial Release
37+
* @todo Implement Date Formats
38+
* @todo Implement ICS Feeds
39+
* @todo Implement All Day Option
40+
*/
741
class DateToolsPlugin extends Plugin
842
{
943
/**
44+
* Get Subscribed Events
45+
*
46+
* @since 1.0.0 Initial Release
47+
*
1048
* @return array
1149
*/
1250
public static function getSubscribedEvents()
@@ -17,7 +55,13 @@ public static function getSubscribedEvents()
1755
}
1856

1957
/**
20-
* Initialize configuration
58+
* Initialize plugin configuration
59+
*
60+
* Initialize twig site variables hook to allow formatting
61+
*
62+
* @since 1.0.0 Initial Release
63+
*
64+
* @return void
2165
*/
2266
public function onPluginsInitialized()
2367
{
@@ -32,7 +76,14 @@ public function onPluginsInitialized()
3276
}
3377

3478
/**
35-
* Set needed variables to display events
79+
* Add datetools variable
80+
*
81+
* Add datetools variable to twig templates for use in filtering
82+
* collections
83+
*
84+
* @since 1.0.0 Initial Release
85+
*
86+
* @return void
3687
*/
3788
public function onTwigSiteVariables()
3889
{

‎vendor/composer/ClassLoader.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
namespace Composer\Autoload;
1414

1515
/**
16-
* ClassLoader implements a PSR-0 class loader
17-
*
18-
* See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
16+
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
1917
*
2018
* $loader = new \Composer\Autoload\ClassLoader();
2119
*
@@ -39,6 +37,8 @@
3937
*
4038
* @author Fabien Potencier <[email protected]>
4139
* @author Jordi Boggiano <[email protected]>
40+
* @see http://www.php-fig.org/psr/psr-0/
41+
* @see http://www.php-fig.org/psr/psr-4/
4242
*/
4343
class ClassLoader
4444
{
@@ -147,7 +147,7 @@ public function add($prefix, $paths, $prepend = false)
147147
* appending or prepending to the ones previously set for this namespace.
148148
*
149149
* @param string $prefix The prefix/namespace, with trailing '\\'
150-
* @param array|string $paths The PSR-0 base directories
150+
* @param array|string $paths The PSR-4 base directories
151151
* @param bool $prepend Whether to prepend the directories
152152
*
153153
* @throws \InvalidArgumentException

‎vendor/composer/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Copyright (c) 2015 Nils Adermann, Jordi Boggiano
2+
Copyright (c) 2016 Nils Adermann, Jordi Boggiano
33

44
Permission is hereby granted, free of charge, to any person obtaining a copy
55
of this software and associated documentation files (the "Software"), to deal

‎vendor/composer/autoload_files.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
$baseDir = dirname($vendorDir);
77

88
return array(
9-
$vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
9+
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
1010
);

‎vendor/composer/autoload_real.php

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,19 @@ public static function getLoader()
4141
$loader->register(true);
4242

4343
$includeFiles = require __DIR__ . '/autoload_files.php';
44-
foreach ($includeFiles as $file) {
45-
composerRequiree295126151982f6a5c5df7ff7e3749b4($file);
44+
foreach ($includeFiles as $fileIdentifier => $file) {
45+
composerRequiree295126151982f6a5c5df7ff7e3749b4($fileIdentifier, $file);
4646
}
4747

4848
return $loader;
4949
}
5050
}
5151

52-
function composerRequiree295126151982f6a5c5df7ff7e3749b4($file)
52+
function composerRequiree295126151982f6a5c5df7ff7e3749b4($fileIdentifier, $file)
5353
{
54-
require $file;
54+
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
55+
require $file;
56+
57+
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
58+
}
5559
}

‎vendor/composer/installed.json

+63-63
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,66 @@
11
[
2+
{
3+
"name": "nesbot/carbon",
4+
"version": "1.21.0",
5+
"version_normalized": "1.21.0.0",
6+
"source": {
7+
"type": "git",
8+
"url": "https://github.com/briannesbitt/Carbon.git",
9+
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
10+
},
11+
"dist": {
12+
"type": "zip",
13+
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
14+
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
15+
"shasum": ""
16+
},
17+
"require": {
18+
"php": ">=5.3.0",
19+
"symfony/translation": "~2.6|~3.0"
20+
},
21+
"require-dev": {
22+
"phpunit/phpunit": "~4.0|~5.0"
23+
},
24+
"time": "2015-11-04 20:07:17",
25+
"type": "library",
26+
"installation-source": "dist",
27+
"autoload": {
28+
"psr-4": {
29+
"Carbon\\": "src/Carbon/"
30+
}
31+
},
32+
"notification-url": "https://packagist.org/downloads/",
33+
"license": [
34+
"MIT"
35+
],
36+
"authors": [
37+
{
38+
"name": "Brian Nesbitt",
39+
"email": "[email protected]",
40+
"homepage": "http://nesbot.com"
41+
}
42+
],
43+
"description": "A simple API extension for DateTime.",
44+
"homepage": "http://carbon.nesbot.com",
45+
"keywords": [
46+
"date",
47+
"datetime",
48+
"time"
49+
]
50+
},
251
{
352
"name": "symfony/polyfill-mbstring",
4-
"version": "v1.1.0",
5-
"version_normalized": "1.1.0.0",
53+
"version": "v1.2.0",
54+
"version_normalized": "1.2.0.0",
655
"source": {
756
"type": "git",
857
"url": "https://github.com/symfony/polyfill-mbstring.git",
9-
"reference": "1289d16209491b584839022f29257ad859b8532d"
58+
"reference": "dff51f72b0706335131b00a7f49606168c582594"
1059
},
1160
"dist": {
1261
"type": "zip",
13-
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
14-
"reference": "1289d16209491b584839022f29257ad859b8532d",
62+
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
63+
"reference": "dff51f72b0706335131b00a7f49606168c582594",
1564
"shasum": ""
1665
},
1766
"require": {
@@ -20,11 +69,11 @@
2069
"suggest": {
2170
"ext-mbstring": "For best performance"
2271
},
23-
"time": "2016-01-20 09:13:37",
72+
"time": "2016-05-18 14:26:46",
2473
"type": "library",
2574
"extra": {
2675
"branch-alias": {
27-
"dev-master": "1.1-dev"
76+
"dev-master": "1.2-dev"
2877
}
2978
},
3079
"installation-source": "dist",
@@ -62,17 +111,17 @@
62111
},
63112
{
64113
"name": "symfony/translation",
65-
"version": "v3.0.2",
66-
"version_normalized": "3.0.2.0",
114+
"version": "v3.1.3",
115+
"version_normalized": "3.1.3.0",
67116
"source": {
68117
"type": "git",
69118
"url": "https://github.com/symfony/translation.git",
70-
"reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91"
119+
"reference": "7713ddf81518d0823b027fe74ec390b80f6b6536"
71120
},
72121
"dist": {
73122
"type": "zip",
74-
"url": "https://api.github.com/repos/symfony/translation/zipball/2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
75-
"reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91",
123+
"url": "https://api.github.com/repos/symfony/translation/zipball/7713ddf81518d0823b027fe74ec390b80f6b6536",
124+
"reference": "7713ddf81518d0823b027fe74ec390b80f6b6536",
76125
"shasum": ""
77126
},
78127
"require": {
@@ -93,11 +142,11 @@
93142
"symfony/config": "",
94143
"symfony/yaml": ""
95144
},
96-
"time": "2016-02-02 13:44:19",
145+
"time": "2016-07-26 08:04:17",
97146
"type": "library",
98147
"extra": {
99148
"branch-alias": {
100-
"dev-master": "3.0-dev"
149+
"dev-master": "3.1-dev"
101150
}
102151
},
103152
"installation-source": "dist",
@@ -125,54 +174,5 @@
125174
],
126175
"description": "Symfony Translation Component",
127176
"homepage": "https://symfony.com"
128-
},
129-
{
130-
"name": "nesbot/carbon",
131-
"version": "1.21.0",
132-
"version_normalized": "1.21.0.0",
133-
"source": {
134-
"type": "git",
135-
"url": "https://github.com/briannesbitt/Carbon.git",
136-
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7"
137-
},
138-
"dist": {
139-
"type": "zip",
140-
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
141-
"reference": "7b08ec6f75791e130012f206e3f7b0e76e18e3d7",
142-
"shasum": ""
143-
},
144-
"require": {
145-
"php": ">=5.3.0",
146-
"symfony/translation": "~2.6|~3.0"
147-
},
148-
"require-dev": {
149-
"phpunit/phpunit": "~4.0|~5.0"
150-
},
151-
"time": "2015-11-04 20:07:17",
152-
"type": "library",
153-
"installation-source": "dist",
154-
"autoload": {
155-
"psr-4": {
156-
"Carbon\\": "src/Carbon/"
157-
}
158-
},
159-
"notification-url": "https://packagist.org/downloads/",
160-
"license": [
161-
"MIT"
162-
],
163-
"authors": [
164-
{
165-
"name": "Brian Nesbitt",
166-
"email": "[email protected]",
167-
"homepage": "http://nesbot.com"
168-
}
169-
],
170-
"description": "A simple API extension for DateTime.",
171-
"homepage": "http://carbon.nesbot.com",
172-
"keywords": [
173-
"date",
174-
"datetime",
175-
"time"
176-
]
177177
}
178178
]

‎vendor/symfony/polyfill-mbstring/Mbstring.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ private static function title_case_upper($s)
577577

578578
private static function getData($file)
579579
{
580-
if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.ser')) {
581-
return unserialize(file_get_contents($file));
580+
if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
581+
return require $file;
582582
}
583583

584584
return false;

0 commit comments

Comments
 (0)