From d36759386050d2464e076b2e1a9fd549a9c81402 Mon Sep 17 00:00:00 2001 From: Colin Hall Date: Thu, 31 Oct 2019 15:46:59 +0000 Subject: [PATCH] Initial Commit v1.0.0 --- .editorconfig | 15 ++++ .gitattributes | 12 ++++ .gitignore | 5 ++ .scrutinizer.yml | 19 +++++ .styleci.yml | 4 ++ .travis.yml | 21 ++++++ CHANGELOG.md | 7 ++ CONTRIBUTING.md | 55 +++++++++++++++ LICENSE.md | 21 ++++++ README.md | 57 +++++++++++++++ composer.json | 52 ++++++++++++++ config/cookie-consent.php | 19 +++++ phpunit.xml.dist | 29 ++++++++ resources/lang/en/widget.php | 10 +++ resources/views/widget.blade.php | 24 +++++++ routes/web.php | 7 ++ src/Console/Commands/InstallCommand.php | 40 +++++++++++ .../CookieConsentServiceProvider.php | 69 +++++++++++++++++++ tests/Feature/ExampleTest.php | 21 ++++++ tests/TestCase.php | 10 +++ tests/Unit/ExampleTest.php | 19 +++++ 21 files changed, 516 insertions(+) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 .scrutinizer.yml create mode 100644 .styleci.yml create mode 100644 .travis.yml create mode 100644 CHANGELOG.md create mode 100644 CONTRIBUTING.md create mode 100644 LICENSE.md create mode 100644 README.md create mode 100644 composer.json create mode 100644 config/cookie-consent.php create mode 100644 phpunit.xml.dist create mode 100644 resources/lang/en/widget.php create mode 100644 resources/views/widget.blade.php create mode 100644 routes/web.php create mode 100644 src/Console/Commands/InstallCommand.php create mode 100644 src/Providers/CookieConsentServiceProvider.php create mode 100644 tests/Feature/ExampleTest.php create mode 100644 tests/TestCase.php create mode 100644 tests/Unit/ExampleTest.php diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..cd8eb86 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..6ff0300 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,12 @@ +# Path-based git attributes +# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html + +# Ignore all test and documentation with "export-ignore". +/.gitattributes export-ignore +/.gitignore export-ignore +/.travis.yml export-ignore +/.styleci.yml export-ignore +/phpunit.xml.dist export-ignore +/.scrutinizer.yml export-ignore +/tests export-ignore +/.editorconfig export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..808f8c5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +build +composer.lock +docs +vendor +coverage \ No newline at end of file diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 0000000..df16b68 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,19 @@ +filter: + excluded_paths: [tests/*] + +checks: + php: + remove_extra_empty_lines: true + remove_php_closing_tag: true + remove_trailing_whitespace: true + fix_use_statements: + remove_unused: true + preserve_multiple: false + preserve_blanklines: true + order_alphabetically: true + fix_php_opening_tag: true + fix_linefeed: true + fix_line_ending: true + fix_identation_4spaces: true + fix_doc_comments: true + diff --git a/.styleci.yml b/.styleci.yml new file mode 100644 index 0000000..f4d3cbc --- /dev/null +++ b/.styleci.yml @@ -0,0 +1,4 @@ +preset: laravel + +disabled: + - single_class_element_per_statement diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..24c2d6c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +language: php + +php: + - 7.1 + - 7.2 + - 7.3 + +env: + matrix: + - COMPOSER_FLAGS="--prefer-lowest" + - COMPOSER_FLAGS="" + +before_script: + - travis_retry composer self-update + - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source + +script: + - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover + +after_script: + - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..429ea20 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +All notable changes to `laravel-cookie-consent` will be documented in this file + +## 1.0.0 - 2019-10-31 + +- Initial release diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..b4ae1c4 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,55 @@ +# Contributing + +Contributions are **welcome** and will be fully **credited**. + +Please read and understand the contribution guide before creating an issue or pull request. + +## Etiquette + +This project is open source, and as such, the maintainers give their free time to build and maintain the source code +held within. They make the code freely available in the hope that it will be of use to other developers. It would be +extremely unfair for them to suffer abuse or anger for their hard work. + +Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the +world that developers are civilized and selfless people. + +It's the duty of the maintainer to ensure that all submissions to the project are of sufficient +quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used. + +## Viability + +When requesting or submitting new features, first consider whether it might be useful to others. Open +source projects are used by many developers, who may have entirely different needs to your own. Think about +whether or not your feature is likely to be used by other users of the project. + +## Procedure + +Before filing an issue: + +- Attempt to replicate the problem, to ensure that it wasn't a coincidental incident. +- Check to make sure your feature suggestion isn't already present within the project. +- Check the pull requests tab to ensure that the bug doesn't have a fix in progress. +- Check the pull requests tab to ensure that the feature isn't already in progress. + +Before submitting a pull request: + +- Check the codebase to ensure that your feature doesn't already exist. +- Check the pull requests to ensure that another person hasn't already submitted the feature or fix. + +## Requirements + +If the project maintainer has any additional requirements, you will find them listed here. + +- **[PSR-2 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer). + +- **Add tests!** - Your patch won't be accepted if it doesn't have tests. + +- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date. + +- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option. + +- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests. + +- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting. + +**Happy coding**! diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..e51392a --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) Macsi Digital Ltd // Colin Hall + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..6bd4f28 --- /dev/null +++ b/README.md @@ -0,0 +1,57 @@ +# Laravel package for Cookie Consent + +A little package to handle cookie consent. All EU sites or sites targeted at EU citizens must comply with the most crazy european law of all, requesting consent to add cookies to the users comupter. + +### Installation + +This package can be used in Laravel 6.0 or higher. + +You can install the package via composer: + +``` bash +composer require macsidigital/laravel-cookie-consent +``` + +The service provider will automatically get registered. Or you may manually add the service provider in your config/app.php file. + +We then need to install the assets: + +``` bash +php artisan cookieconsent:install +``` + +This will publish a config file, the views and language files + +## Usage + +To use we just need to add a blade include just before the end body tag + +``` php +@include('cookieConsent::widget') +``` + +To amend the design just go into the resources views folder and amend 'widget.blade.php'. Note we have used inline styles so that we are not reliant on any design framework. But we would recommend changing this to use something like tailwind. + +Finally the more info will try to direct to a route '/cookie-policy', you will need to create this route yourself in your routes file, as well as the template file that lists your cookie policy. + +### Changelog + +Please see [CHANGELOG](CHANGELOG.md) for more information what has changed recently. + +## Contributing + +Please see [CONTRIBUTING](CONTRIBUTING.md) for details. + +### Security + +If you discover any security related issues, please email colin@macsi.co.uk instead of using the issue tracker. + +## Credits + +- [Macsi Digital](https://github.com/macsidigital) +- [Colin Hall](https://github.com/colinhall17) +- [All Contributors](../../contributors) + +## License + +The MIT License (MIT). Please see [License File](LICENSE.md) for more information. \ No newline at end of file diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..d63e4b0 --- /dev/null +++ b/composer.json @@ -0,0 +1,52 @@ +{ + "name": "macsidigital/laravel-cookie-consent", + "description": "Laravel cookie consent package", + "homepage": "https://github.com/MacsiDigital/laravel-cookie-consent", + "keywords": ["macsidigital", "laravel-cookie-consent", "cookie-consent", "laravel", "api", "client"], + "license": "MIT", + "type": "library", + "authors": [ + { + "name": "Colin Hall", + "email": "colin@macsi.co.uk", + "role": "Developer" + } + ], + "require": { + "php": "^7.3", + "illuminate/support": "^6.0" + }, + "require-dev": { + "orchestra/testbench": "^4.0", + "phpunit/phpunit": "^8.0" + }, + "autoload": { + "psr-4": { + "MacsiDigital\\CookieConsent\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "MacsiDigital\\CookieConsent\\Tests\\": "tests" + } + }, + "scripts": { + "test": "vendor/bin/phpunit", + "test-coverage": "vendor/bin/phpunit --coverage-html coverage" + + }, + "config": { + "sort-packages": true + }, + "extra": { + "laravel": { + "providers": [ + "MacsiDigital\\CookieConsent\\Providers\\CookieConsentServiceProvider" + ], + "aliases": { + "Boilerplate": "MacsiDigital\\CookieConsent\\Facades\\Boilerplate" + } + } + }, + "minimum-stability" : "dev" +} diff --git a/config/cookie-consent.php b/config/cookie-consent.php new file mode 100644 index 0000000..f3d5540 --- /dev/null +++ b/config/cookie-consent.php @@ -0,0 +1,19 @@ + env('COOKIE_CONSENT_ENABLED', true), + + /* + * Cookie name to save if user consented + */ + 'cookie_name' => 'laravel_cookie_consent', + + /* + * Cookie duration in minutes. Default is 60 * 24 * 365 * 5. (5 years) + */ + 'cookie_duration' => 60 * 24 * 365 * 5, +]; \ No newline at end of file diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..22fe879 --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,29 @@ + + + + + tests + + + + + src/ + + + + + + + + + + diff --git a/resources/lang/en/widget.php b/resources/lang/en/widget.php new file mode 100644 index 0000000..3442875 --- /dev/null +++ b/resources/lang/en/widget.php @@ -0,0 +1,10 @@ + 'We use Cookies', + 'description' => 'This site uses cookies to give you a great user experience and helps us to improve our offerings. By using our site you consent to our use of cookies', + 'more_info_button' => 'View Cookie Policy', + 'accept_button' => 'Accept Cookies' +]; \ No newline at end of file diff --git a/resources/views/widget.blade.php b/resources/views/widget.blade.php new file mode 100644 index 0000000..181f006 --- /dev/null +++ b/resources/views/widget.blade.php @@ -0,0 +1,24 @@ +@if($consent_required) + + + + + +@endif \ No newline at end of file diff --git a/routes/web.php b/routes/web.php new file mode 100644 index 0000000..0ee046f --- /dev/null +++ b/routes/web.php @@ -0,0 +1,7 @@ +withCookie(cookie(config('cookie-consent.cookie_name'), 'true', config('cookie-consent.cookie_duration'))); + return $response; +}); \ No newline at end of file diff --git a/src/Console/Commands/InstallCommand.php b/src/Console/Commands/InstallCommand.php new file mode 100644 index 0000000..6572a7a --- /dev/null +++ b/src/Console/Commands/InstallCommand.php @@ -0,0 +1,40 @@ +comment('Publishing Cookie Consent Assets and Configs...'); + $this->callSilent('vendor:publish', ['--provider' => 'MacsiDigital\CookieConsent\Providers\CookieConsentServiceProvider']); + $this->info('Cookie consent installed successfully.'); + } +} diff --git a/src/Providers/CookieConsentServiceProvider.php b/src/Providers/CookieConsentServiceProvider.php new file mode 100644 index 0000000..04fd59f --- /dev/null +++ b/src/Providers/CookieConsentServiceProvider.php @@ -0,0 +1,69 @@ +loadRoutesFrom(__DIR__.'/../../routes/web.php'); + + $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'cookieConsent'); + + $this->mergeConfigFrom(__DIR__.'/../../config/cookie-consent.php', 'cookie-consent'); + + $this->loadViewsFrom(__DIR__.'/../../resources/views', 'cookieConsent'); + + if ($this->app->runningInConsole()) { + $this->publishes([ + __DIR__.'/../../config/cookie-consent.php' => config_path('cookie-consent.php'), + ], 'config'); + + $this->publishes([ + __DIR__.'/../../resources/views' => base_path('resources/views/vendor/cookieConsent'), + ], 'views'); + + $this->publishes([ + __DIR__.'/../../resources/lang' => base_path('resources/lang/vendor/cookieConsent'), + ], 'lang'); + + // Registering package commands. + $this->commands([ + InstallCommand::class, + ]); + } + } + + /** + * Register the application services. + */ + public function register() + { + $this->registerViewShare(); + } + + protected function registerViewShare() + { + $consent_required = false; + if (config('cookie-consent.enabled')){ + $cookieName = config('cookie-consent.cookie_name'); + if(! Cookie::has($cookieName)){ + $consent_required = true; + } + } + app('view')->share('consent_required', $consent_required); + } + +} diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php new file mode 100644 index 0000000..e11aa95 --- /dev/null +++ b/tests/Feature/ExampleTest.php @@ -0,0 +1,21 @@ +get('/'); + + $response->assertStatus(200); + } +} diff --git a/tests/TestCase.php b/tests/TestCase.php new file mode 100644 index 0000000..5bc22aa --- /dev/null +++ b/tests/TestCase.php @@ -0,0 +1,10 @@ +assertTrue(true); + } +}