Merge pull request #20 from yiimaker/4.0

Release 4.0.0

.gitattributes

@@ -5,4 +5,4 @@
 /.scrutinizer.yml   export-ignore
 /codeception.yml    export-ignore
 /tests              export-ignore
-/docs               export-ignore
+/docs               export-ignore

.gitignore

@@ -22,4 +22,4 @@ nbproject
 Thumbs.db
 
 # Mac DS_Store Files
-.DS_Store
+.DS_Store

.scrutinizer.yml

@@ -4,15 +4,40 @@ filter:
 checks:
     php:
         code_rating: true
+        duplication: false
+        unused_methods: true
+        unused_parameters: true
+        argument_type_checks: true
+        verify_property_names: true
+        method_calls_on_non_object: false
+        fix_doc_comments: true
+        instanceof_class_exists: true
+        catch_class_exists: true
+        assignment_of_null_return: false
+        use_statement_alias_conflict: false
+        simplify_boolean_return: true
+        return_doc_comments: true
+        return_doc_comment_if_not_inferrable: true
         remove_extra_empty_lines: true
         remove_php_closing_tag: true
-        remove_trailing_whitespace: true
+        parameters_in_camelcaps: true
+        parameter_doc_comments: true
+        param_doc_comment_if_not_inferrable: true
+        properties_in_camelcaps: true
+        no_long_variable_names:
+            maximum: '20'
+        no_goto: true
+        more_specific_types_in_doc_comments: true
         fix_use_statements:
             remove_unused: true
             preserve_multiple: false
             preserve_blanklines: true
-            order_alphabetically: true
-        fix_php_opening_tag: true
-        fix_linefeed: true
+            order_alphabetically: false
         fix_line_ending: true
-        fix_doc_comments: true
+        fix_php_opening_tag: true
+
+coding_style:
+    php:
+        spaces:
+            around_operators:
+                concatenation: true

.travis.yml

@@ -4,6 +4,7 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 # environment variable used in test suite
 env: TEST_ENVIRONMENT=travis
@@ -29,4 +30,4 @@ before_script:
 # run tests
 script:
   - composer validate --no-check-lock
-  - composer test
+  - composer test

CHANGELOG.md

@@ -1,6 +1,20 @@
 Email Templates Module Change Log
 ---------------------------------
 
+4.0.0 April 22, 2018
+--------------------
+* Enh: Inject repository object to template manager (greeflas)
+* Enh: Inject repository object to email template behavior (greeflas)
+* Chg: Changed minimum Yii version from `^2.0.0` to `^2.0.13` (greeflas)
+* Chg: Changed minimum `motion/yii2-language-provider` version from `~1.0` to `~2.1` (greeflas)
+* Chg: Using `yiimaker/yii2-translatable` instead of `creocoder/yii2-translateable` (greeflas)
+* Chg: Moved `yiisoft/yii2-bootstrap`, `vova07/yii2-imperavi-widget` packages to suggesting (greeflas)
+* Chg: Removed `ymaker\email\templates\helpers\LanguageHelper` helper (greeflas)
+* Chg: Created repository class for email template entity
+* Fix: Removed unused dev packages `codeception/verify` and `codeception/specify` (greeflas)
+* Fix: Some fixes in files for unit tests (greeflas)
+* Fix: Fixed bugs in migration (greeflas)
+
 3.0.1 January 22, 2018
 ----------------------
 Fix: Fixes bugs in migration (greeflas, philippfrenzel)

CONTRIBUTING.md

@@ -28,4 +28,4 @@ $ codecept build && codecept run
 ```
 
 Happy coding :)
----------------
+---------------

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Yii Maker
+Copyright (c) 2017-2018, Yii Maker
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -31,7 +31,7 @@ $ composer require yiimaker/yii2-email-templates
 or add
 
 ```
-"yiimaker/yii2-email-templates": "~3.0"
+"yiimaker/yii2-email-templates": "~4.0"
 ```
 
 to the `require` section of your `composer.json`.
@@ -129,4 +129,4 @@ License
 
 This project is released under the terms of the BSD-3-Clause [license](LICENSE).
 
-Copyright (c) 2017, Yii Maker
+Copyright (c) 2017-2018, Yii Maker

UPGRADE.md

@@ -4,8 +4,32 @@ Upgrading Instructions
 This file contains the upgrade notes. These notes highlight changes that could break your
 application when you upgrade the package from one version to another.
 
-Upgrade from 2.1.0 to 3.0.0
----------------------------
+Upgrade from 3.x to 4.x
+-----------------------
+
+* Moved entities from `ymaker\email\tempaltes\models\entities` namespace to `ymaker\email\tempaltes\entities`
+
+* Moved `yiisoft/yii2-bootstrap`, `vova07/yii2-imperavi-widget` packages to suggesting
+
+* Changed minimum Yii version from `^2.0.0` to `^2.0.13`
+
+* Changed minimum `motion/yii2-language-provider` version from `~1.0.` to `~2.1`
+
+* Removed unused dev packages `codeception/verify` and `codeception/specify`
+
+* Removed `ymaker\email\templates\helpers\LanguageHelper` class. Use `motion\i18n\helpers\LanguageHelper` instead
+
+* Removed `ymaker\email\templates\Module::$service` property. Use `ymaker\email\templates\Module::$repository` instead
+
+* Removed `ymaker\email\templates\components\TemplateManager::getFirstOrDefault()` method
+
+* Created `ymaker\email\templates\repositories\EmailTemplatesRepositoryInterface` and `ymaker\email\templates\repositories\EmailTemplatesRepositoryInterface`
+instead of `ymaker\email\templates\services\ServiceInterface` and `ymaker\email\templates\services\EmailtemplateService`
+
+* Using `yiimaker/yii2-translatable` instead of `creocoder/yii2-translateable`
+
+Upgrade from 2.x to 3.x
+-----------------------
 
 * Language provider package changed from `yii2deman/yii2deman-language-provider` to `motion/yii2-language-provider`.
 You must updates language provider configuration in backend module config.
@@ -25,4 +49,4 @@ instead of `ymaker\email\templates\services\DbService`.
 
 * Renamed `_service` property to `service` in default controller.
 
-* Changed minimum `vova07/yii2-imperavi-widget` package version from `~1.3.1` to `~2.0`. 
+* Changed minimum `vova07/yii2-imperavi-widget` package version from `~1.3.1` to `~2.0`.

codeception.yml

@@ -23,4 +23,4 @@ modules:
             dump: 'tests/_data/dump.sql'
             cleanup: true,
             populate: true,
-            reconnect: false
+            reconnect: false

composer.json

@@ -23,17 +23,17 @@
   ],
   "require": {
     "php": ">=5.6.0",
-    "yiisoft/yii2": "^2.0.0",
-    "yiisoft/yii2-bootstrap": "~2.0.0",
-    "motion/yii2-language-provider": "~1.0",
-    "creocoder/yii2-translateable": "~1.0",
-    "vova07/yii2-imperavi-widget": "~2.0"
+    "yiisoft/yii2": "^2.0.13",
+    "motion/yii2-language-provider": "~2.1",
+    "yiimaker/yii2-translatable": "~1.0"
   },
   "require-dev": {
     "yiisoft/yii2-gii": "~2.0.0",
-    "codeception/codeception": "~2.0",
-    "codeception/verify": "*",
-    "codeception/specify": "*"
+    "codeception/codeception": "~2.0"
+  },
+  "suggest": {
+    "yiisoft/yii2-bootstrap": "If you want use default view files in backend you should install this package",
+    "vova07/yii2-imperavi-widget": "If you want use Imperavi editor you should install this package"
   },
   "autoload": {
     "psr-4": {
@@ -47,7 +47,7 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "3.0.x-dev"
+      "dev-master": "4.0.x-dev"
     }
   },
   "scripts": {
@@ -56,4 +56,4 @@
       "codecept run"
     ]
   }
-}
+}