Add PSR-4 support

nazbav · Dec 28, 2023 · ac7a8c2 · ac7a8c2
1 parent 3feeb5b
commit ac7a8c2
Show file tree

Hide file tree

Showing 15 changed files with 435 additions and 606 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+
+vendor/
+.idea/
diff --git a/Library/NCL/NCL.php b/Library/NCL/NCL.php
@@ -1,4 +1,6 @@
 <?php
+namespace seagullua\NameCaseLib\NCL;
+
 /**
  * @license Dual licensed under the MIT or GPL Version 2 licenses.
  * @package NameCaseLib

diff --git a/Library/NCL/NCLNameCaseCore.php b/Library/NCL/NCLNameCaseCore.php
@@ -1,4 +1,5 @@
 <?php
+namespace seagullua\NameCaseLib\NCL;
 
 /**
  * @license Dual licensed under the MIT or GPL Version 2 licenses.
@@ -7,14 +8,6 @@
 /**
  *
  */
-if (!defined('NCL_DIR'))
-{
-		define('NCL_DIR', dirname(__FILE__));
-}
-
-require_once NCL_DIR . '/NCL.php';
-require_once NCL_DIR . '/NCLStr.php';
-require_once NCL_DIR . '/NCLNameCaseWord.php';
 
 /**
  * <b>NCL NameCase Core</b>

diff --git a/Library/NCL/NCLNameCaseWord.php b/Library/NCL/NCLNameCaseWord.php
@@ -1,4 +1,5 @@
 <?php
+namespace seagullua\NameCaseLib\NCL;
 /**
  * @license Dual licensed under the MIT or GPL Version 2 licenses.
  * @package NameCaseLib

diff --git a/Library/NCL/NCLStr.php b/Library/NCL/NCLStr.php
@@ -1,4 +1,5 @@
 <?php
+namespace seagullua\NameCaseLib\NCL;
 /**
  * @license Dual licensed under the MIT or GPL Version 2 licenses.
  * @package NameCaseLib

diff --git a/Library/NCLNameCaseRu.php b/Library/NCLNameCaseRu.php
diff --git a/Library/NCLNameCaseUa.php b/Library/NCLNameCaseUa.php
diff --git a/README.md b/README.md
@@ -5,6 +5,10 @@ NameCaseLib — библиотека PHP5, предназначенная для
 - Демонстрация работы - http://namecaselib.com/case/
 - Документация - http://namecaselib.com/book/
 
+## 0.4.2 (2023-12-28) (@nazbav)
+- Delete includes
+- Add PSR-4 support
+
 ## 0.4.1 (2016-11-23)
 - Rules updates (5 years of work)
 - Any pull requests with the new rules updates will be merged now

diff --git a/Tests/Library/NCLNameCaseRuTestFatherboy.php b/Tests/Library/NCLNameCaseRuTestFatherboy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../Library/NCL.NameCase.ru.php';
+require_once dirname(__FILE__) . '/../../Library/NCLNameCaseRu.php';
 
 
 class NCLNameCaseRuTest extends PHPUnit_Framework_TestCase

diff --git a/Tests/Library/NCLNameCaseRuTestFathergirl.php b/Tests/Library/NCLNameCaseRuTestFathergirl.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../Library/NCL.NameCase.ru.php';
+require_once dirname(__FILE__) . '/../../Library/NCLNameCaseRu.php';
 
 
 class NCLNameCaseRuTest extends PHPUnit_Framework_TestCase

diff --git a/Tests/Library/NCLNameCaseRuTestNamesgirl.php b/Tests/Library/NCLNameCaseRuTestNamesgirl.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../Library/NCL.NameCase.ru.php';
+require_once dirname(__FILE__) . '/../../Library/NCLNameCaseRu.php';
 
 
 class NCLNameCaseRuTest extends PHPUnit_Framework_TestCase

diff --git a/Tests/Library/NCLNameCaseRuTestSirnamesboy.php b/Tests/Library/NCLNameCaseRuTestSirnamesboy.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../Library/NCL.NameCase.ru.php';
+require_once dirname(__FILE__) . '/../../Library/NCLNameCaseRu.php';
 
 
 class NCLNameCaseRuTest extends PHPUnit_Framework_TestCase

diff --git a/Tests/Library/NCLNameCaseRuTestSirnamesgirl.php b/Tests/Library/NCLNameCaseRuTestSirnamesgirl.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__) . '/../../Library/NCL.NameCase.ru.php';
+require_once dirname(__FILE__) . '/../../Library/NCLNameCaseRu.php';
 
 
 class NCLNameCaseRuTest extends PHPUnit_Framework_TestCase

diff --git a/Tests/testPSR4.php b/Tests/testPSR4.php
@@ -0,0 +1,23 @@
+<?php
+
+
+use seagullua\NameCaseLib\NCLNameCaseRu;
+
+header('Content-type: text/html; charset=utf-8');
+
+/**
+ * Подключаем необходимый язык
+ */
+require '../vendor/autoload.php';
+/**
+ * Создаем обьект класса.
+ * Теперь библиотека готова к работе
+ */
+$nc = new NCLNameCaseRu();
+/**
+ * Производим склонения и выводим результат на экран
+ */
+
+print_r($nc->qSecondName("Иванов"));
+print_r($nc->qFirstName("Андрей"));
+print_r($nc->qFatherName("Алексеевич"));
diff --git a/composer.json b/composer.json
@@ -0,0 +1,25 @@
+{
+  "name": "nazbav/name-case-lib",
+  "description": "NameCaseLib — библиотека PHP5, предназначенная для автоматического склонения ФИО в русском и украинском языках. Уникальная особенность состоит в том, что библиотека содержит одинаковые методы для работы с ФИО на русском и украинском языках.",
+  "minimum-stability": "stable",
+  "license": "MIT",
+  "varsion": "0.4.2",
+  "authors": [
+    {
+      "name": "Andriy Chaika",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Rabotyahoff",
+      "homepage": "https://github.com/Rabotyahoff"
+    }
+  ],
+  "autoload": {
+    "psr-4": {
+      "seagullua\\NameCaseLib\\": "Library/"
+    }
+  },
+  "require": {
+    "php": ">=5.6"
+  }
+}