Merge pull request #82 from FictionLabs/develop

v4.12

.gitignore

@@ -15,6 +15,9 @@
 .idea
 .DS_Store
 
+# phpunit
+.phpunit.result.cache
+
 # composer
 /vendor/*
 /composer.lock

.travis.yml

@@ -1,12 +1,12 @@
 language: php
 
 php:
-  - 7.3
+  - 7.4
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.3
+    - php: 7.4
 
 script:
   - make dev
@@ -18,11 +18,10 @@ script:
 deploy:
   provider: releases
   api_key:
-    secure: TJVEw9U/tlXqSkc4VeV+63f/AdTLqO9oRVFLIIDr5E5so2krc/DET7+CFL6JBCm+9eGfTfUoYbDlZmQq28trHkKX7sfVO3jmYf857AxntM+ThdYpAmohHPH44aV0ea1gIaYPDn0A4eIapTnHeuLZqBER6dFNuOqyoSiMx++I5MCMdXqgm4XU/XkpyY6x1egZu0jkQTKBb+tW9F3yucrg5QfK7cBI6rpsXcbOqllvDwKGQaOcNh5Bv2CDuVSVkIp8WdO6oZAHdcXdH9ED4cfkbjibOMqms02QnIMevjU2vOEtFMpsNSGFCfhj+9XaIsjKPM3FKA8LycPRY5/CJ2MYvN04tr3HzaHbALkuM/8OBNBHxylSSaUQ2650dOdVDjne4IPkgndXJ+JAu0eRQO736FntrHue7w4fmBPMNmo6/hXau8yEW/hw6wfMEBlQqE9B9Nz9tbmtXjolFdzvAg1FW9CKS2rw0hwk6QWpfMxbVI6/xfXG06jgQpQFOxkH8Fj0XsN0tjeazi6+KAh7u7rH0ejO8+BCJKj19SLnNML2/s9GayN6XZp+JwaJb38/j7Wd+dNDxoy4006Rpfbscvko1yAR5E0OfmSnrwgMKAUv93vAvVkEZUHP4wk2tsSOFG5s94Y1U5YveDmjW2mIPnPsFz4tAbIvEpp89mnYO5KbIwg=
+    secure: hZvt8D4qE/gob4D/uJPE5TDihGqHxsQ5AQE6pwL9MviznFT8751bZFWtw2HCL0qVDSEY4xjPX+1TxvUPK9xyDOA+Z9poj9zzdJCtVqR9Wmcruz6ILUVV8/vPjmLHbOr59rjhuNKZwfLtdGUII6D78dfv1n8brucFUqCARsgCGxYBBV8VxEWECVwjzBRXwETfBQ0EO4N79aDIy5JTQMNM3nAmij5pyq1KF2YdFrJjCkzZTnu6nkXeK8Ii4ucJ3rl6jIJTurA6T0h+M6YgTuyrYb8TNMsyZ1MmTJcji2LOZnOS/Jxagh8hUCHy4svIJdMDb88Zfy3K3H4OhGcyUtUv5Jt4J2bvG/femEkw9e0+rg02FMkSw4KXYftgvLq0OX6v8XioHtxGH6jqg2ucp8J7LJlYiaGeTAkShJZ04nhI7wD0uMPEL8QKmoFOkW8QJ7k26FbOSDGCkIhu6FpigAm+UNDjNgJ0IELJ4dvDDhXv6wxk7Q1iOM6ZPuLXQde0xbL/BGGQPN1PnUHojT7jY/tBKttjhuAKtuEQ/NU3NgGcnlO63TnVkP51RoqqP64x2mpT9SUE5ooWcRnEvBfUuV/IH7Af4wSRBMiy3LY7H4vzWa+5MAohqdayd1ZIRoE8epXzt+cb2n7wRsA4vWb/EAT7gRvwSOLLRqrXpB3LEbDeBTs=
   file:
-     - "./build/jbzoo_clean_install.zip"
-     - "./build/jbzoo_update.zip"
-  skip_cleanup: true
+    - "./build/jbzoo_clean_install.zip"
+    - "./build/jbzoo_update.zip"
   on:
-    repo: JBZoo/JBZoo
-    tags: true
+    repo: JBZoo-CCK/JBZoo
+  skip_cleanup: 'true'

CODE_OF_CONDUCT.md

@@ -43,4 +43,4 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -1,4 +1,6 @@
-# JBZoo Community Edition [![Build Status](https://travis-ci.org/JBZoo/JBZoo.svg?branch=master)](https://travis-ci.org/JBZoo/JBZoo)    [![Latest Stable Version](https://poser.pugx.org/jbzoo/jbzoo/v/stable)](https://github.com/JBZoo/JBZoo/releases)    [![License](https://poser.pugx.org/JBZoo/JBZoo/license)](https://packagist.org/packages/JBZoo/JBZoo)   [![Analytics](https://ga-beacon.appspot.com/UA-122740514-1/jbzoo-readme)](https://github.com/igrigorik/ga-beacon)
+# JBZoo CCK - Community Edition
+
+[![Build Status](https://travis-ci.org/JBZoo-CCK/JBZoo.svg)](https://travis-ci.org/JBZoo-CCK/JBZoo)    [![Latest Stable Version](https://poser.pugx.org/jbzoo-cck/jbzoo/v/stable)](https://github.com/JBZoo-CCK/JBZoo/releases)    [![HitCount](http://hits.dwyl.com/jbzoo-cck/jbzoo.svg)](http://hits.dwyl.com/jbzoo-cck/jbzoo)
 
  * All Features are included
  * GPL v2.0 or later license
@@ -7,14 +9,14 @@
  * No domain limits
  * For any private/commercial use (see license conditions)
  * On your own risk (see license conditions)
- * And of course you can add your fixes via [Github (PR)](https://github.com/JBZoo/JBZoo/blob/master/PULL_REQUEST_TEMPLATE.md)
+ * Of course, you can add your fixes via [Github (PR)](https://github.com/JBZoo-CCK/JBZoo-CCK/blob/master/PULL_REQUEST_TEMPLATE.md)
 
 
 ## System requirements
- * YooTheme Zoo Component [![Zoo](https://img.shields.io/badge/Zoo-3.3.31-blue.svg?style=plastic)](https://www.yootheme.com/zoo)
- * Joomla! CMS [![Joomla](https://img.shields.io/badge/Joomla!-3.8.10-blue.svg?style=plastic)](https://downloads.joomla.org/)
- * ![PHP 7.2.0+](https://img.shields.io/badge/PHP-7.2.0+-blue.svg?style=plastic) is recommended with modules mbstring, xml, json, opcache, mysqli.
- * Works fine with PHP v5.5, v5.6, v7.1
+ * YooTheme Zoo Component [![Zoo](https://img.shields.io/badge/Zoo-4.0.8-blue.svg?style=plastic)](https://www.yootheme.com/zoo)
+ * Joomla! CMS [![Joomla](https://img.shields.io/badge/Joomla!-3.9.25-blue.svg?style=plastic)](https://downloads.joomla.org/)
+ * ![PHP 7.2.0+](https://img.shields.io/badge/PHP-7.4.0+-blue.svg?style=plastic) is recommended with modules mbstring, xml, json, opcache, mysqli.
+ * Works fine with PHP v5.5, v5.6, v7.1, v7.2, v7.3, v7.4
  * Joomla! CMS 4.0 (on your own risk)
 
 ## FAQ
@@ -23,22 +25,22 @@ Watch and star this repo (see buttons in the top) and Github will send you notif
 
 ### 2. How to GPL previous JBZoo version <= 2.4.x ?
 First of all, we recommend you to upgrade your JBZoo to the latest paid version 2.4.x (only if you wish).
-After that just use special patch from [that repository](https://github.com/JBZoo/JBZoo-2-GPL-patches)
+After that, just use a special patch from [that repository](https://github.com/JBZoo-CCK/JBZoo-2-GPL-patches)
 
 ### 3. How to build Joomla installer/update package (distr)?
 Run in the root directory of project `make prod build` and see `./build/` folder
 
 ### 4. I have found some bugs. What should I do?
-Just create [new issue](https://github.com/JBZoo/JBZoo/issues/new/choose) and we will try to fix it.
+Just create [new issue](https://github.com/JBZoo-CCK/JBZoo/issues/new/choose) and we will try to fix it.
 
-### 5. How to use jbzoo_update.zip? 
+### 5. How to use jbzoo_update.zip?
  - Backup your website (database, all files)
  - Install file "jbzoo_update.zip" as Joomla Extention (via control Panel).
  - That's all.
- - If you have any bugs - [just create new issue](https://github.com/JBZoo/JBZoo/issues/new/choose)
+ - If you have any bugs - [just create new issue](https://github.com/JBZoo-CCK/JBZoo/issues/new/choose)
 
 ### 6. Where I can download the ready-to-use JBZoo?
-See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https://github.com/JBZoo/JBZoo/releases) 
+See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https://github.com/JBZoo-CCK/JBZoo/releases)
 
 
 ## Useful links
@@ -50,26 +52,27 @@ See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https:/
  * [JBZoo Marketplace (extentions)](http://forum.jbzoo.com/files/)
 
 ### Our Related Projects
- * [JBZoo CLI extention](https://github.com/JBZoo/CCK-Cli)
- * [JBlank Template](https://github.com/JBZoo/JBlank)
+ * [JBZoo CLI extension](https://github.com/JBZoo-CCK/CCK-Cli)
+ * [JBlank Template](https://github.com/JBZoo-CCK/JBlank)
  * [Our libs and tools](https://github.com/JBZoo)
 
 ### About YooTheme ZOO
  * [YT Zoo Component (Original)](https://www.yootheme.com/zoo)
- * [YT Zoo Component (JBZoo Community Edition)](https://github.com/JBZoo/YOOtheme-Zoo)
- * [YT Zoo Performance Hacks](https://github.com/JBZoo/Zoo-Hacks)
+ * [YT Zoo Component (JBZoo Community Edition)](https://github.com/JBZoo-CCK/YOOtheme-Zoo)
+ * [YT Zoo Performance Hacks](https://github.com/JBZoo-CCK/Zoo-Hacks)
 
 
-## Contributors 
- * [Denis Smetannikov](https://github.com/SmetDenis) (SmetDenis) `-=! Author, Founder and General Developer !=-`
+## Contributors
+ * [Denis Smetannikov](https://github.com/SmetDenis) (SmetDenis) `-=! Author, Founder and General Maintainer !=-`
+ * [Dmitriy Vasyukov](https://github.com/fiction13) (fiction13)
+ * [Eugene Kopylov](https://github.com/CB9TOIIIA) (CB9TOIIIA)
  * [Sergey Kalistratov](https://github.com/Cheren) (Cheren)
  * [Alexandr Oganov](https://github.com/Tapakan) (Tapakan)
- * [Eugene Kopylov](https://github.com/CB9TOIIIA) (CB9TOIIIA)
- * ... and [other](https://github.com/JBZoo/JBZoo/graphs/contributors)
+ * ... and [other](https://github.com/JBZoo-CCK/JBZoo/graphs/contributors)
 
 
 ## PHP Unit tests
-Unfortunately now we are checking only copyrights and some code styles. [See details](https://travis-ci.org/JBZoo/JBZoo).
+Unfortunately now we are checking only copyrights, and some code styles. [See details](https://travis-ci.org/JBZoo-CCK/JBZoo).
 
 ```sh
 make dev

composer.json

@@ -1,5 +1,5 @@
 {
-    "name"         : "jbzoo/jbzoo",
+    "name"         : "jbzoo-cck/jbzoo",
     "license"      : "GPL-2.0",
     "description"  : "JBZoo App is universal Joomla CCK, application for YooTheme Zoo component",
 
@@ -19,7 +19,7 @@
     },
 
     "require-dev"  : {
-        "jbzoo/phpunit"      : "^2.3",
+        "jbzoo/phpunit"      : "^3.2",
         "symfony/var-dumper" : "^4.1.1"
     }
 }

src/packages/jbuniversal/file_jbuniversal.xml

@@ -14,11 +14,11 @@
 <extension type="file" version="2.5" method="upgrade">
     <name>JBZoo App</name>
     <author>JBZoo.com</author>
-    <creationDate>2018 June</creationDate>
+    <creationDate>2020 August</creationDate>
     <copyright>Copyright (C) JBZoo.com, All rights reserved.</copyright>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>http://jbzoo.com</authorUrl>
-    <version>4.10.3</version>
+    <version>4.12.0</version>
     <license>GPL-2.0</license>
     <description>JBZoo App is universal Joomla CCK, application for YooTheme Zoo component</description>
     <fileset>

src/packages/jbuniversal/jbuniversal/application.php

@@ -25,7 +25,7 @@
  */
 final class JBUniversalApplication extends Application
 {
-    const JBZOO_VERSION = '4.0.2';
+    const JBZOO_VERSION = '4.12.0';
 
     /**
      * @var bool

src/packages/jbuniversal/jbuniversal/application.xml

@@ -14,8 +14,8 @@
 <application>
     <name>JBZoo App</name>
     <group>jbuniversal</group>
-    <version>4.10.3</version>
-    <creationDate>2018 June</creationDate>
+    <version>4.12.0</version>
+    <creationDate>2020 August</creationDate>
     <author>JBZoo.com</author>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>http://jbzoo.com</authorUrl>