Merge pull request #3 from Kephson/master

New version to be compatible with TYPO3 8.7 and 9.5
marketing-factory · Jul 23, 2020 · 290c5ae · 290c5ae
2 parents 5f14e4e + c102ba4
commit 290c5ae
Show file tree

Hide file tree

Showing 37 changed files with 731 additions and 508 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,79 @@
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear on external disk
+.Spotlight-V100
+.Trashes
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Created by .ignore support plugin (hsz.mobi)
+### Typo3 template
+## TYPO3 v6.2
+# Ignore several upload and file directories.
+/fileadmin/user_upload/
+/fileadmin/_temp_/
+/fileadmin/_processed_/
+/uploads/
+# Ignore cache
+/typo3conf/temp_CACHED*
+/typo3conf/temp_fieldInfo.php
+/typo3conf/deprecation_*.log
+/typo3conf/ENABLE_INSTALL_TOOL
+/typo3conf/realurl_autoconf.php
+/FIRST_INSTALL
+# Ignore system folders, you should have them symlinked.
+# If not comment out the following entries.
+/typo3
+/typo3_src
+/typo3_src-*
+/Packages
+/.htaccess
+/index.php
+# Ignore temp directory.
+/typo3temp/
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+*.iml
+out
+gen
+
+*.lock
diff --git a/.travis.yml b/.travis.yml
diff --git a/ChangeLog b/ChangeLog
@@ -1,31 +1,8 @@
-2015-07-30  Tomasz Krawczyk  <[email protected]>
-	* Added support for capitals.
-	* Added a few currencies.
-	* Updated PHP dependency to 5.6.
-	* Added compatibility with TYPO3 6.2.
-	* Dropped support for TYPO3 older than 6.2.
+2019-10-08  Ephraim Härer  <[email protected]>
+    * updates for TYPO3 9.5
+    * release of version 6.8.1
 
-2014-09-17  Tomasz Krawczyk  <[email protected]>
-	* Made changes for compatibility with static_info_tables v. 6.1.0.
-	* Removed commented out sql commands from the ext_tables_static_update.sql file.
-	* Updated dependencies.
 
-2014-09-17  Tomasz Krawczyk  <[email protected]>
-	* Updated dependencies.
-
-2014-08-17  Simon Schmidt
-	* Update dependencies and bugfix name for argentina.
-
-2013-03-11  Simon Schmidt
-	* Updated dependencies.
-
-2011-12-18  Tomasz Krawczyk  <[email protected]>
-	* Made changes for compatibility with static_info_tables v. 2.3.0.
-
-2011-08-03  Tomasz Krawczyk  <[email protected]>
-	* Updated Polish countries.
-	* Added Polish zones, languages, territories and a few currencies.
-	* Updated US zones.
-
-2011-06-15 
-	* Got a list of Polish names for countries.
+2019-06-11  Ephraim Härer  <[email protected]>
+    * compatibility for TYPO3 9.5
+    * release of version 6.8.0
diff --git a/Classes/Domain/Model/Country.php b/Classes/Domain/Model/Country.php
@@ -1,31 +1,27 @@
 <?php
+
 namespace SJBR\StaticInfoTables\Domain\Model;
 
-    /***************************************************************
-     *  Copyright notice
-     *
-     *  (c) 2011-2012 Armin Rüdiger Vieweg <[email protected]>
-     *  (c) 2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
-     *  (c) 2015 Tomasz Krawczyk <tomasz(na)typo3.pl>
-     *
-     *  All rights reserved
-     *
-     *  This script is part of the TYPO3 project. The TYPO3 project is
-     *  free software; you can redistribute it and/or modify
-     *  it under the terms of the GNU General Public License as published by
-     *  the Free Software Foundation; either version 2 of the License, or
-     *  (at your option) any later version.
-     *
-     *  The GNU General Public License can be found at
-     *  http://www.gnu.org/copyleft/gpl.html.
-     *
-     *  This script is distributed in the hope that it will be useful,
-     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     *  GNU General Public License for more details.
-     *
-     *  This copyright notice MUST APPEAR in all copies of the script!
-     ***************************************************************/
+/***************************************************************
+ *  Copyright notice
+ *  (c) 2011-2012 Armin Rüdiger Vieweg <[email protected]>
+ *  (c) 2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
+ *  (c) 2015 Tomasz Krawczyk <tomasz(na)typo3.pl>
+ *  All rights reserved
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
 /**
  * The Country model
  *
@@ -34,20 +30,24 @@
  */
 class Country extends AbstractEntity
 {
+
     /**
      * The Polish short name
+     *
      * @var string
      */
     protected $shortNamePl = '';
 
     /**
      * The Polish official name
+     *
      * @var string
      */
     protected $officialNamePl = '';
 
     /**
      * The Polish capital name
+     *
      * @var string
      */
     protected $capitalPl = '';
@@ -56,7 +56,6 @@ class Country extends AbstractEntity
      * Sets the Polish short name.
      *
      * @param string $shortNamePl
-     *
      * @return void
      */
     public function setShortNamePl($shortNamePl)
@@ -78,7 +77,6 @@ public function getShortNamePl()
      * Sets the Polish short name.
      *
      * @param string $officialNamePl
-     *
      * @return void
      */
     public function setOfficialtNamePl($officialNamePl)
@@ -100,7 +98,6 @@ public function getOfficialNamePl()
      * Sets the Polish short name.
      *
      * @param string $capitalPl
-     *
      * @return void
      */
     public function setCapitalPl($capitalPl)

diff --git a/Classes/Domain/Model/CountryTest.php b/Classes/Domain/Model/CountryTest.php
diff --git a/Classes/Domain/Model/CountryZone.php b/Classes/Domain/Model/CountryZone.php
@@ -1,30 +1,26 @@
 <?php
+
 namespace SJBR\StaticInfoTables\Domain\Model;
 
-    /***************************************************************
-     *  Copyright notice
-     *
-     *  (c) 2011-2012 Armin Rüdiger Vieweg <[email protected]>
-     *  (c) 2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
-     *
-     *  All rights reserved
-     *
-     *  This script is part of the TYPO3 project. The TYPO3 project is
-     *  free software; you can redistribute it and/or modify
-     *  it under the terms of the GNU General Public License as published by
-     *  the Free Software Foundation; either version 2 of the License, or
-     *  (at your option) any later version.
-     *
-     *  The GNU General Public License can be found at
-     *  http://www.gnu.org/copyleft/gpl.html.
-     *
-     *  This script is distributed in the hope that it will be useful,
-     *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-     *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     *  GNU General Public License for more details.
-     *
-     *  This copyright notice MUST APPEAR in all copies of the script!
-     ***************************************************************/
+/***************************************************************
+ *  Copyright notice
+ *  (c) 2011-2012 Armin Rüdiger Vieweg <[email protected]>
+ *  (c) 2013 Stanislas Rolland <typo3(arobas)sjbr.ca>
+ *  All rights reserved
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
 /**
  * The Country Zone model
  *
@@ -33,8 +29,10 @@
  */
 class CountryZone extends AbstractEntity
 {
+
     /**
      * Polish name of the country zone
+     *
      * @var string
      */
     protected $namePl = '';
@@ -43,7 +41,6 @@ class CountryZone extends AbstractEntity
      * Sets the Polish name.
      *
      * @param string $namePl
-     *
      * @return void
      */
     public function setNamePl($namePl)
@@ -63,4 +60,4 @@ public function getNamePl()
         }
         return $this->namePl;
     }
-}
+}