Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up Utils class with minor fixes #1830

Merged
merged 1 commit into from
Jan 19, 2018
Merged

Clean up Utils class with minor fixes #1830

merged 1 commit into from
Jan 19, 2018

Conversation

mahagr
Copy link
Member

@mahagr mahagr commented Jan 15, 2018 •
edited
Loading

  • contains(): allow $needle to be an array just like in startsWith() and endsWith()
  • Add some checks and casting to avoid possible notices
  • Some minor code optimizations, use simpler code
  • Use more strict comparisons
  • Fix broken multi-part uploads in Windows (open file in binary mode)

@rhukster
Copy link
Member

Looks fine to me. There are a couple of optimizations which 'might' have an effect, but I doubt. I would like to merge and test at this point, then we can roll back any issues.

@rhukster rhukster merged commit 821c4f7 into 1.4 Jan 19, 2018
rhukster added a commit that referenced this pull request Mar 9, 2018
@rhukster
Squashed commit of the following:
8b4e3fe 
commit d008376
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Mar 8 17:08:20 2018 -0700

    Updated parsedown + toolbox

commit eaac778
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Mar 8 14:52:49 2018 -0700

    Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`

commit 43ca0a2
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Mar 7 11:57:55 2018 -0700

    vendor updates

commit 54cd7f8
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Mar 2 15:39:59 2018 -0600

    `theme_var()` twig function now checks page header var first

commit 5ffe32e
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Mar 1 15:30:51 2018 -0600

    Fix alt tag issue #1883

commit b0ad83e
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Mar 1 15:13:42 2018 -0600

    support both alt and alt_text

commit 5b291f8
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Feb 22 16:14:24 2018 -0700

    Added Route overrides

commit 274c701
Author: Matias Griese <matias@kunena.org>
Date:   Thu Feb 22 09:00:41 2018 +0200

    Improved Object serialize()/unserialize()

commit e533024
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Feb 21 23:00:37 2018 -0700

    Added `{% switch %}` twig tag

commit 8750602
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Feb 21 17:28:43 2018 -0700

    Added new `{% markdown %}` twig tag

commit 42d8836
Author: Matias Griese <matias@rockettheme.com>
Date:   Wed Feb 21 19:42:09 2018 +0200

    Improved `Session` initialization (#1879)

commit 7cfc6fb
Merge: 01886b6 b7d4697
Author: Matias Griese <matias@kunena.org>
Date:   Wed Feb 21 12:53:48 2018 +0200

    Merge remote-tracking branch 'origin/1.4' into 1.4

commit 01886b6
Author: Matias Griese <matias@kunena.org>
Date:   Wed Feb 21 12:53:40 2018 +0200

    Added better session checks, warn in debugbar if session messages cannot be used

commit b7d4697
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Feb 20 17:30:17 2018 -0700

    changelog updated

commit 742c6f9
Author: Matias Griese <matias@kunena.org>
Date:   Tue Feb 20 12:00:17 2018 +0200

    Fixed issue with UriFactory::parseQuery()

commit c97da77
Merge: 871848d 84a0b5d
Author: Matias Griese <matias@kunena.org>
Date:   Tue Feb 20 11:07:36 2018 +0200

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit 871848d
Author: Matias Griese <matias@kunena.org>
Date:   Tue Feb 20 11:07:28 2018 +0200

    Added `Grav\Framework\Route` classes to allow route/link manipulation
    Added `$grav['uri]->getCurrentRoute()` method to get `Grav\Framework\Route\Route` instance for the current URL

commit 84a0b5d
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Feb 19 21:23:11 2018 -0700

    cleanup with default value

commit 8e68317
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Feb 19 11:48:38 2018 -0700

    Composer updates

commit 35f7a2a
Author: Matias Griese <matias@kunena.org>
Date:   Mon Feb 19 11:10:37 2018 +0200

    Added `$grav['uri]->getCurrentUri()` function to get `Grav\Framework\Uri` instance for the current URL.

commit 62dfa0e
Author: Matias Griese <matias@kunena.org>
Date:   Mon Feb 19 10:30:16 2018 +0200

    Reorder functions in Common\Uri class

commit 2e28461
Author: Andy Miller <rhuk@mac.com>
Date:   Sun Feb 18 14:08:23 2018 -0700

    Updated changelog

commit 4259d01
Author: Andy Miller <rhuk@mac.com>
Date:   Sun Feb 18 14:07:35 2018 -0700

    Fix bug with remote minimum PHP version determination

commit 39783df
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 14:35:02 2018 +0200

    Fixed bug with absolute_urls=true

commit d39253e
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 14:28:26 2018 +0200

    Moved URI parts filtering functions to Framework\UriPartsFilter class

commit 8286803
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 13:03:56 2018 +0200

    Some code cleanup on ParsedownGravTrait and Grav classes

commit 17ba58a
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 13:00:40 2018 +0200

    Framework\Uri: Improve query parameter handling

commit 0a79788
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 12:23:45 2018 +0200

    Improve Uri class by adding useful tests

commit ccf0f9c
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Feb 16 18:16:07 2018 -0700

    Added support for `php` dependencies in GPM blueprints

commit 79e580a
Author: Matias Griese <matias@kunena.org>
Date:   Sat Feb 17 00:18:21 2018 +0200

    Added `Grav\Framework\Uri` classes extending PSR-7 `HTTP message UriInterface` implementation

commit 5b9a40d
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Feb 15 15:53:36 2018 -0700

    Prepare for release

commit 550468a
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Feb 15 14:51:31 2018 -0700

    Added checkbox-style support for `switch` field

commit 84a2a08
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Feb 14 22:29:41 2018 -0700

    Fixed YAML blueprint valdiation/filtering

commit ee8ea5a
Author: Matias Griese <matias@kunena.org>
Date:   Fri Feb 9 10:44:32 2018 +0200

    Clean up Utils class with minor fixes

commit f91678d
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Feb 6 09:42:13 2018 -0700

    Fix for invalid template error in evaluate()

commit 4c654ef
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Feb 5 13:07:51 2018 -0700

    Stopped Chrome from auto-completing admin user profile form #1847

commit 637308d
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Feb 5 11:59:14 2018 -0700

    Fix for opengraph tags #1849

commit 08be06c
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jan 31 16:07:36 2018 -0700

    Addd a new Medium:exists() method

commit 19ae66d
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jan 31 14:04:56 2018 -0700

    updated changelog

commit c3f84d8
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jan 31 14:04:50 2018 -0700

    new read_file() twig function

commit c721be8
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Jan 25 16:40:02 2018 -0700

    Added yaml encode/decode filters

commit 47746d3
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Jan 25 16:37:21 2018 -0700

    Added new Collection::toExtendedArray()

commit 103ac4b
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jan 24 15:42:27 2018 -0700

    Improve collection filtering

commit d2e3ea0
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Jan 22 12:27:03 2018 -0700

    Prepare for release

commit 16ca3da
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Jan 22 12:25:17 2018 -0700

    Updated pimple release

commit db5f0ef
Author: Andy Miller <rhuk@mac.com>
Date:   Sun Jan 21 17:01:45 2018 -0700

    Fix for bad `Uri::filter()` call

    getgrav/grav-plugin-page-inject#14

commit 8eb0f87
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 11:19:29 2018 -0700

    Changelog updated

commit 2c44980
Author: Gabriel Caruso <carusogabriel34@gmail.com>
Date:   Fri Jan 19 16:15:20 2018 -0200

    Refactoring tests (#1779)

commit 75e293b
Merge: 422eb5b 821c4f7
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 11:13:49 2018 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit 422eb5b
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 11:13:27 2018 -0700

    License date update

commit 821c4f7
Author: Matias Griese <matias@rockettheme.com>
Date:   Fri Jan 19 20:09:51 2018 +0200

    Clean up Utils class with minor fixes (#1830)

commit dcbb5ef
Merge: 758ea8f 8d39fdf
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 10:32:37 2018 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

    # Conflicts:
    #	CHANGELOG.md

commit 758ea8f
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 10:31:33 2018 -0700

    Slight change in Whoops colors

commit 5a27977
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Jan 19 10:30:53 2018 -0700

    vendor updates

commit 8d39fdf
Author: Matias Griese <matias@kunena.org>
Date:   Fri Jan 19 12:53:33 2018 +0200

    Bug fix on Cache TTL = null

commit 73bd402
Author: Matias Griese <matias@kunena.org>
Date:   Fri Jan 19 12:03:32 2018 +0200

    `Framework\Cache`: Update all exceptions to be compatible with `Psr\SimpleCache`

commit c473c0b
Author: Matias Griese <matias@kunena.org>
Date:   Fri Jan 19 11:49:01 2018 +0200

    Fixes wrong exception in ChainCache

commit 827b4e5
Author: Matias Griese <matias@kunena.org>
Date:   Fri Jan 19 11:28:47 2018 +0200

    Clean up Utils class with minor fixes

commit 14af38f
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Jan 11 17:52:10 2018 -0700

    Moved url() function into Utils class

commit 2c4d530
Merge: 4677bad ae245c0
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jan 9 22:47:15 2018 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit 4677bad
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Jan 9 22:47:11 2018 -0700

    Modular blueprint update

commit ae245c0
Author: Matias Griese <matias@kunena.org>
Date:   Tue Jan 9 21:24:19 2018 +0200

    Misc object fixes (new features only)

commit 154fa4e
Author: Matias Griese <matias@kunena.org>
Date:   Tue Jan 9 13:02:36 2018 +0200

    Update changelog

commit a744b7f
Author: Matias Griese <matias@kunena.org>
Date:   Tue Jan 9 12:08:37 2018 +0200

    Objects: Add protected function `getVariable()` to get serialized value for a single property
    `ObjectPropertyTrait`: Added protected functions `isPropertyLoaded()`, `offsetLoad()`, `offsetPrepare()` and `offsetSerialize()`

commit 72abab6
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Jan 4 11:45:31 2018 -0700

    Dates should always be sorted numerically

commit 0feeb74
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 29 13:24:10 2017 -0700

    update defines

commit 96fd694
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 29 13:12:18 2017 -0700

    Use quark by default

commit b2c883c
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 29 13:11:12 2017 -0700

    updated changelog

commit 7941786
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Dec 28 17:21:52 2017 -0700

    Setting Quark to default theme

commit 2ad9b6d
Author: Andy Miller <rhuk@mac.com>
Date:   Thu Dec 28 14:39:35 2017 -0700

    Fixes that ‘should’ work.

commit 59f7f15
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Dec 27 14:58:56 2017 -0700

    Get current route correctly

commit 8f522ee
Merge: f48c0b1 b35b9ea
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Dec 27 13:39:27 2017 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit f48c0b1
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Dec 27 13:39:16 2017 -0700

    fix for special chars in base path #1799

commit b35b9ea
Merge: e217489 5df6db9
Author: Matias Griese <matias@kunena.org>
Date:   Wed Dec 27 21:03:48 2017 +0200

    Merge remote-tracking branch 'origin/1.4' into 1.4

commit e217489
Author: Matias Griese <matias@kunena.org>
Date:   Wed Dec 27 21:03:41 2017 +0200

    Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin

commit 5df6db9
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Dec 26 15:01:44 2017 -0700

    Added a new typography page

commit bd57807
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 17:34:49 2017 -0700

    removed _set method as it breaks GPM

commit a8a061d
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 14:28:07 2017 -0700

    updated defines for beta.2

commit 9d41417
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 14:21:43 2017 -0700

    updated changelog

commit 3888358
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 14:07:55 2017 -0700

    Updated to latest vendor libs

commit 62302c0
Merge: 2d93c1a 42de0bb
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 12:18:17 2017 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit 2d93c1a
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 18 12:18:10 2017 -0700

    title change

commit 42de0bb
Author: Matias Griese <matias@kunena.org>
Date:   Mon Dec 18 09:16:52 2017 +0200

    Changelog update

commit 3e15de7
Author: Andy Miller <rhuk@mac.com>
Date:   Sun Dec 17 13:45:48 2017 -0700

    Added `header_var` twig function

commit a1c804e
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 15 16:08:53 2017 -0700

    Changed title

commit 559fde4
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 15 15:54:50 2017 -0700

    Tweak to default page

commit 1f1c429
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 15 15:27:23 2017 -0700

    updated changelog

commit e9b7c8d
Merge: b6e5bfa fb106b1
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 15 15:13:29 2017 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

    # Conflicts:
    #	CHANGELOG.md

commit b6e5bfa
Author: Andy Miller <rhuk@mac.com>
Date:   Fri Dec 15 15:12:26 2017 -0700

    Fixed `BadMethodException` in GPM updates #1784

commit fb106b1
Author: Matias Griese <matias@kunena.org>
Date:   Fri Dec 15 21:31:40 2017 +0200

    Removed constructor from ObjectInterface

commit 34e3be7
Merge: 2167419 af14652
Author: Matias Griese <matias@kunena.org>
Date:   Fri Dec 15 21:28:51 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.4

    # Conflicts:
    #	composer.lock

commit 2167419
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Dec 13 22:19:43 2017 -0700

    Updated changelog

commit aadb8bb
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Dec 13 21:51:06 2017 -0700

    Added some new theme twig functions

commit 592c3ea
Merge: 97b088b 3fec18e
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Dec 12 11:29:51 2017 -0700

    Merge branch '1.4' of https://github.com/getgrav/grav into 1.4

commit 97b088b
Author: Andy Miller <rhuk@mac.com>
Date:   Tue Dec 12 11:29:02 2017 -0700

    Updated welcome page

commit 3fec18e
Author: Matias Griese <matias@kunena.org>
Date:   Tue Dec 12 12:47:12 2017 +0200

    Composer update

commit b15c5d7
Merge: d629391 24898de
Author: Matias Griese <matias@kunena.org>
Date:   Tue Dec 12 12:45:14 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 1.4

commit d629391
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 11 15:08:20 2017 -0700

    updated changelog

commit 7ec66b2
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 11 15:08:05 2017 -0700

    Transferred copyright

commit b5f75ac
Author: Andy Miller <rhuk@mac.com>
Date:   Mon Dec 11 13:17:03 2017 -0700

    Fix array casting with DOM elements

commit 255f2f1
Author: Djamil Legato <djamil@djamil.it>
Date:   Mon Dec 11 11:56:07 2017 -0800

    Changed GPM channel to testing

commit d34fad6
Author: Djamil Legato <djamil@djamil.it>
Date:   Mon Dec 11 11:49:19 2017 -0800

    Removed Page interfaces

commit 8d82fce
Author: Djamil Legato <djamil@djamil.it>
Date:   Mon Dec 11 11:46:30 2017 -0800

    Updated version to 1.4.0-beta.1

commit bfd8a08
Merge: cc648b8 6628bbb
Author: Matias Griese <matias@kunena.org>
Date:   Mon Dec 11 20:54:33 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md
    #	system/defines.php

commit cc648b8
Author: Djamil Legato <djamil@djamil.it>
Date:   Fri Dec 8 18:14:04 2017 -0800

    Updated grav version for 2.0 branch

commit acbc857
Merge: d943c55 b2fc101
Author: Matias Griese <matias@kunena.org>
Date:   Fri Dec 1 20:41:25 2017 +0200

    Merge remote-tracking branch 'origin/2.0' into 2.0

commit b2fc101
Merge: 0524bd2 6ae4680
Author: Djamil Legato <djamil@djamil.it>
Date:   Fri Dec 1 10:41:06 2017 -0800

    Merge branch 'develop' into 2.0

commit d943c55
Merge: 0524bd2 6ae4680
Author: Matias Griese <matias@kunena.org>
Date:   Fri Dec 1 20:40:36 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 0524bd2
Merge: 66d8269 b4cf789
Author: Matias Griese <matias@kunena.org>
Date:   Fri Dec 1 14:49:26 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 66d8269
Merge: ddd451b a1eccfd
Author: Matias Griese <matias@kunena.org>
Date:   Wed Nov 29 10:46:46 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit ddd451b
Merge: aa2341d cb4147a
Author: Matias Griese <matias@kunena.org>
Date:   Fri Nov 17 08:04:41 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit aa2341d
Merge: b31490e 31e3c1c
Author: Matias Griese <matias@kunena.org>
Date:   Mon Nov 13 09:48:35 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	system/src/Grav/Common/User/User.php

commit b31490e
Merge: 980b2b6 0fd22ad
Author: Matias Griese <matias@kunena.org>
Date:   Mon Nov 6 10:28:10 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 980b2b6
Author: Matias Griese <matias@kunena.org>
Date:   Mon Nov 6 10:18:22 2017 +0200

    Code readability improvements

commit cd15055
Merge: 3380577 0895b15
Author: Matias Griese <matias@kunena.org>
Date:   Wed Nov 1 07:48:45 2017 +0200

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 3380577
Author: Matias Griese <matias@kunena.org>
Date:   Wed Nov 1 07:45:59 2017 +0200

    Improved script/style tag parameter handling

commit 7c19d15
Author: Matias Griese <matias@kunena.org>
Date:   Tue Oct 31 20:02:26 2017 +0200

    Tweaked script/style tag formatting

commit 84789cb
Author: Matias Griese <matias@kunena.org>
Date:   Tue Oct 31 16:50:05 2017 +0200

    Added `{% script %}` and `{% style %}` tags for Twig templates

commit 586fcf4
Author: Matias Griese <matias@kunena.org>
Date:   Mon Oct 30 13:31:47 2017 +0200

    Added `{% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %}` tag to allow basic exception handling inside Twig

commit 18c597b
Merge: d00d8cb e9e4106
Author: Matias Griese <matias@kunena.org>
Date:   Fri Oct 27 11:49:43 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit d00d8cb
Merge: ae14381 d3695b2
Author: Matias Griese <matias@kunena.org>
Date:   Wed Oct 25 11:07:39 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit ae14381
Author: Djamil Legato <djamil@djamil.it>
Date:   Thu Oct 19 17:37:29 2017 -0400

    Updated default with new media order

commit 98dca95
Merge: 731fe50 2842b8f
Author: Matias Griese <matias@kunena.org>
Date:   Wed Oct 18 09:16:46 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 731fe50
Merge: c7be8eb cc69591
Author: Matias Griese <matias@kunena.org>
Date:   Fri Oct 13 11:41:10 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit c7be8eb
Merge: 4e6738c 974fc55
Author: Matias Griese <matias@kunena.org>
Date:   Thu Oct 12 10:50:08 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 4e6738c
Author: Matias Griese <matias@kunena.org>
Date:   Wed Oct 4 15:24:45 2017 +0300

    Composer update

commit 0d4a5a2
Merge: 8b3949b 15ec8fe
Author: Matias Griese <matias@kunena.org>
Date:   Wed Oct 4 13:09:31 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md
    #	composer.lock
    #	system/src/Grav/Common/Twig/TwigExtension.php

commit 8b3949b
Author: Matias Griese <matias@kunena.org>
Date:   Wed Sep 27 10:13:26 2017 +0300

    Fixed nested object access by Object::getNestedProperty()

commit a535e85
Author: Matias Griese <matias@kunena.org>
Date:   Tue Sep 26 19:02:51 2017 +0300

    Fix bug

commit 0fd6fda
Author: Matias Griese <matias@kunena.org>
Date:   Tue Sep 26 18:26:39 2017 +0300

    Add method ObjectCollection::collectionGroup()

commit 71b1136
Author: Matias Griese <matias@kunena.org>
Date:   Mon Sep 25 14:17:14 2017 +0300

    Add support to serialize Object properties

commit 588c509
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 15 14:05:21 2017 +0300

    Add ArrayCollection::chunk() function

commit 37b5818
Author: mahagr <matias@liinalapsi.fi>
Date:   Thu Sep 14 15:58:16 2017 +0300

    Fix bug on Object ArrayAccess

commit 23592b8
Author: Matias Griese <matias@kunena.org>
Date:   Wed Sep 13 09:50:34 2017 +0300

    Major update on Object classes (backwards incompatible)

commit 6238997
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 8 15:50:05 2017 +0300

    Object code cleanup

commit c0e1e15
Merge: 8c32103 f2898f9
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 8 14:54:50 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	composer.json
    #	composer.lock
    #	system/src/Grav/Common/Twig/TwigExtension.php

commit 8c32103
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 8 14:44:37 2017 +0300

    Add `ArrayObject` and make `Object` not to implement `ArrayAccess` interface. Remove Toolbox dependency.

commit 758ccad
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 8 14:40:16 2017 +0300

    Code cleanup

commit cd11b14
Author: Matias Griese <matias@kunena.org>
Date:   Fri Sep 8 14:39:33 2017 +0300

    Add `FileCollectionInterface` and `AbstractFileCollection` classes

commit cdb5d59
Author: Matias Griese <matias@kunena.org>
Date:   Wed Aug 30 14:08:57 2017 +0300

    Fix a bug in MemoryCache

commit fab81b9
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 29 11:17:54 2017 +0300

    Composer update

commit 1bae601
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 29 11:17:38 2017 +0300

    Add new FileCache class

commit a4795a9
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 29 10:37:14 2017 +0300

    Add new SessionCache class

commit 0644eac
Merge: 96ee41a 7a3f136
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 29 08:56:04 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md
    #	system/src/Grav/Common/Twig/TwigExtension.php

commit 96ee41a
Author: Matias Griese <matias@kunena.org>
Date:   Fri Aug 18 12:28:13 2017 +0300

    Follow PSR-2 in Grav\Framework

commit d15eb0e
Author: Matias Griese <matias@kunena.org>
Date:   Thu Aug 17 10:01:42 2017 +0300

    Composer update

commit c3066cd
Merge: 557a3b8 cafd371
Author: Matias Griese <matias@kunena.org>
Date:   Thu Aug 17 09:59:29 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 557a3b8
Merge: f89fe0e 51c3b6d
Author: Matias Griese <matias@kunena.org>
Date:   Wed Aug 16 09:30:09 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	composer.lock

commit f89fe0e
Merge: ad5cddf 04d7945
Author: Djamil Legato <djamil@djamil.it>
Date:   Mon Aug 14 15:17:58 2017 -0700

    Merge branch 'develop' into 2.0

commit ad5cddf
Merge: fb0e086 4b948e2
Author: Matias Griese <matias@kunena.org>
Date:   Mon Aug 14 20:15:43 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit fb0e086
Author: Matias Griese <matias@kunena.org>
Date:   Thu Aug 10 21:13:14 2017 +0300

    Composer: Force doctrine/cache to use v1.6 (with PHP 5.5 support)

commit 53611c8
Author: Matias Griese <matias@kunena.org>
Date:   Thu Aug 10 21:08:42 2017 +0300

    Composer: Use develop version of rockettheme/toolbox

commit dbebd14
Author: Matias Griese <matias@kunena.org>
Date:   Thu Aug 10 11:40:42 2017 +0300

    Because of B/C issues, login/logout code needed to be moved into the Login plugin

commit 6e511d0
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 8 17:50:26 2017 +0300

    Improve login/logout logic

commit 9685ab4
Author: Matias Griese <matias@kunena.org>
Date:   Tue Aug 8 14:31:53 2017 +0300

    Added `$grav->login()` and `$grav->logout()` functions with event hooks for plugins
    Added events `onUserLoginAuthenticate`, `onUserLoginAuthorize`, `onUserLoginFailure`, `onUserLogin`, `onUserLogout`

commit 670f0ce
Merge: 6fadaa0 1bfbb71
Author: mahagr <matias@liinalapsi.fi>
Date:   Wed Jul 19 15:35:05 2017 -0600

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 6fadaa0
Author: Andy Miller <rhuk@mac.com>
Date:   Wed Jul 19 14:28:57 2017 -0600

    Added nicenumber twig filter

commit 039d228
Author: mahagr <matias@liinalapsi.fi>
Date:   Tue Jul 18 15:37:04 2017 -0600

    Add Object::getKey() function

commit 0cde375
Merge: a59fc7b bbc4a23
Author: mahagr <matias@liinalapsi.fi>
Date:   Tue Jul 18 15:34:41 2017 -0600

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit a59fc7b
Merge: ee07963 4b72383
Author: Matias Griese <matias@kunena.org>
Date:   Tue Jul 4 09:51:44 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit ee07963
Merge: ce319de 90182e2
Author: Matias Griese <matias@kunena.org>
Date:   Wed Jun 28 10:37:46 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit ce319de
Merge: 1bd3d26 5e329d3
Author: Matias Griese <matias@kunena.org>
Date:   Mon Jun 12 09:30:11 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 1bd3d26
Merge: 3468f59 947c920
Author: Matias Griese <matias@kunena.org>
Date:   Thu Jun 8 11:29:08 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 3468f59
Merge: c4fac41 ff8a8dd
Author: Matias Griese <matias@kunena.org>
Date:   Tue Jun 6 12:20:04 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit c4fac41
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 31 13:35:14 2017 +0300

    Improve CacheTrait::getMultiple()

commit 512aae3
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 31 13:34:04 2017 +0300

    Fix cloning issues with ObjectCollection

commit 6731319
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 29 14:30:52 2017 +0300

    Improve caching functions

commit 668c980
Merge: 6dbf704 c1edbab
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 29 10:12:20 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 6dbf704
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 29 10:12:02 2017 +0300

    Implement memory and chain cache

commit 83943ce
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 26 13:12:18 2017 +0300

    Namespace and TTL not needed in MemoryCache adapter

commit 99eff95
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 26 12:27:48 2017 +0300

    Implement MemoryCache adapter

commit 5ec844d
Merge: 7f3f634 0ca5812
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 26 11:57:00 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 7f3f634
Merge: 4cc502c b2070c8
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 24 15:18:23 2017 +0300

    Merge branch 'feature/debug-json' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit b2070c8
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 24 15:15:14 2017 +0300

    Fix error on missing renderer if using unknown file extension

commit 6ffc062
Merge: 7ca0f87 f22d6be
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 24 15:13:11 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into feature/debug-json

    # Conflicts:
    #	CHANGELOG.md

commit 4cc502c
Merge: 78cb767 7ca0f87
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 22 15:10:41 2017 +0300

    Merge branch 'feature/debug-json' of https://github.com/getgrav/grav into 2.0

commit 7ca0f87
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 22 14:55:26 2017 +0300

    Make it possible to include debug bar also into non-HTML responses

commit 78cb767
Merge: 9d918ad d40cb3c
Author: Matias Griese <matias@kunena.org>
Date:   Mon May 22 09:09:32 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 9d918ad
Merge: cb29d81 f7266ef
Author: Matias Griese <matias@kunena.org>
Date:   Fri May 19 08:09:43 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit cb29d81
Merge: dd23846 890b028
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 18 17:45:34 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit dd23846
Merge: 4b14a0d 5a93fcf
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 18 13:09:52 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit 4b14a0d
Merge: bf687e6 f3cecd8
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 18 09:52:06 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

commit bf687e6
Merge: 0128416 ffe286e
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 18 09:45:03 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 0128416
Merge: 0269ec5 6496508
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 17 09:27:02 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	CHANGELOG.md

commit 0269ec5
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 16 19:04:24 2017 +0300

    Object collections: Allow property get, set and grouping for nested arrays

commit 91a6224
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 16 19:03:23 2017 +0300

    Rename Object::offsetLoad_*() functions, nested array access

commit b480156
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 16 12:24:41 2017 +0300

    Update docblocks

commit c7bcbea
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 16 12:00:49 2017 +0300

    Add support for loading properties in Object class

commit 41c130c
Merge: 4f27ff1 d11099c
Author: Matias Griese <matias@kunena.org>
Date:   Tue May 16 10:54:16 2017 +0300

    Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

    # Conflicts:
    #	composer.lock

commit 4f27ff1
Merge: d1654a3 8ff2003
Author: Djamil Legato <djamil@djamil.it>
Date:   Fri May 12 14:08:47 2017 -0700

    Merge branch 'develop' into 2.0

    # Conflicts:
    #	composer.json
    #	composer.lock

commit d1654a3
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 11 13:34:43 2017 +0300

    Added `Grav\Framework\Cache` classes providing PSR-16 `Simple Cache` implementation

commit 77c2e47
Author: Matias Griese <matias@kunena.org>
Date:   Thu May 11 13:20:01 2017 +0300

    Greatly simplify Object classes

commit ec4d451
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 10 11:34:23 2017 +0300

    Fix for PHP 5.5 support in ObjectCollectionTrait

commit 65c0c44
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 10 11:02:51 2017 +0300

    Use older version of doctrine/collections (PHP 5.5 support)

commit 6685dad
Author: Matias Griese <matias@kunena.org>
Date:   Wed May 10 10:21:01 2017 +0300

    Oops, accidentally merged local 2.0 branch into develop, revert GravTrait deprecation and add back new Framework classes
@mahagr mahagr deleted the feature/utils branch March 20, 2018 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mahagr @rhukster