move model/view/controller under src/ and install php-cs-fixer style …

…checker
NatLibFi · Apr 18, 2023 · cc8d10e · cc8d10e
1 parent 83087ae
commit cc8d10e
Show file tree

Hide file tree

Showing 76 changed files with 77 additions and 231 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,6 +50,9 @@ jobs:
         php_version: ${{ matrix.php_version }}
         php_extensions: gettext intl xsl pcov
 
+    - name: Check PHP code style
+      run: ./vendor/bin/php-cs-fixer --diff --dry-run
+
     - name: Run PHPUnit tests
       uses: php-actions/phpunit@v3
       env:

diff --git a/.htaccess b/.htaccess
@@ -3,16 +3,16 @@ Options +FollowSymlinks -MultiViews -Indexes
 RewriteEngine on
 
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^entity$ entity.php [L]
+RewriteRule ^entity$ src/entity.php [L]
 
 RewriteRule ^rest/v1/swagger.json$ swagger.json [L]
 
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^rest/v1/(.*)$ rest.php/$1 [L]
+RewriteRule ^rest/v1/(.*)$ src/rest.php/$1 [L]
 
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond $0 !^resource/
-RewriteRule ^(.*)$ index.php/$1 [L] 
+RewriteRule ^(.*)$ src/index.php/$1 [L] 
 
 RewriteCond $0 ^favicon.ico$
 RewriteCond custom-favicon.ico -F

diff --git a/composer.json b/composer.json
@@ -22,9 +22,10 @@
   "require-dev": {
     "phpunit/phpunit": "9.5.*",
     "symfony/dom-crawler": "5.4.*",
-    "mockery/mockery": "1.5.1"
+    "mockery/mockery": "1.5.1",
+    "friendsofphp/php-cs-fixer": "3.16.*"
   },
   "autoload": {
-    "classmap": ["controller/", "model/", "model/sparql/"]
+    "classmap": ["src/controller/", "src/model/", "src/model/sparql/"]
   }
 }
diff --git a/migrate-config.php b/migrate-config.php
diff --git a/controller/Controller.php → src/controller/Controller.php b/controller/Controller.php → src/controller/Controller.php
diff --git a/controller/EntityController.php → src/controller/EntityController.php b/controller/EntityController.php → src/controller/EntityController.php
diff --git a/controller/Honeypot.php → src/controller/Honeypot.php b/controller/Honeypot.php → src/controller/Honeypot.php
diff --git a/controller/RestController.php → src/controller/RestController.php b/controller/RestController.php → src/controller/RestController.php
diff --git a/controller/WebController.php → src/controller/WebController.php b/controller/WebController.php → src/controller/WebController.php
@@ -35,7 +35,7 @@ public function __construct($model)
         }
 
         // specify where to look for templates and cache
-        $loader = new Twig_Loader_Filesystem('view');
+        $loader = new Twig_Loader_Filesystem('src/view');
         // initialize Twig environment
         $this->twig = new Twig_Environment($loader, array('cache' => $tmpDir,'auto_reload' => true));
         $this->twig->addExtension(new Twig_Extensions_Extension_I18n());

diff --git a/entity.php → src/entity.php b/entity.php → src/entity.php
@@ -3,7 +3,7 @@
 /**
  * Includes the side wide settings.
  */
-require_once 'vendor/autoload.php';
+require_once '../vendor/autoload.php';
 
 header("Access-Control-Allow-Origin: *"); // enable CORS
 

diff --git a/index.php → src/index.php b/index.php → src/index.php
@@ -4,10 +4,10 @@
  * Use Composer autoloader to automatically load library classes.
  */
 try {
-    if (!file_exists('./vendor/autoload.php')) {
+    if (!file_exists('../vendor/autoload.php')) {
         throw new Exception('Dependencies managed by Composer missing. Please run "php composer.phar install".');
     }
-    require_once 'vendor/autoload.php';
+    require_once '../vendor/autoload.php';
 } catch (Exception $e) {
     echo "Error: " . $e->getMessage();
     return;

diff --git a/model/BaseConfig.php → src/model/BaseConfig.php b/model/BaseConfig.php → src/model/BaseConfig.php
diff --git a/model/Breadcrumb.php → src/model/Breadcrumb.php b/model/Breadcrumb.php → src/model/Breadcrumb.php
diff --git a/model/Cache.php → src/model/Cache.php b/model/Cache.php → src/model/Cache.php
diff --git a/model/Concept.php → src/model/Concept.php b/model/Concept.php → src/model/Concept.php
diff --git a/model/ConceptMappingPropertyValue.php → src/model/ConceptMappingPropertyValue.php b/model/ConceptMappingPropertyValue.php → src/model/ConceptMappingPropertyValue.php
diff --git a/model/ConceptProperty.php → src/model/ConceptProperty.php b/model/ConceptProperty.php → src/model/ConceptProperty.php
diff --git a/model/ConceptPropertyValue.php → src/model/ConceptPropertyValue.php b/model/ConceptPropertyValue.php → src/model/ConceptPropertyValue.php
diff --git a/model/ConceptPropertyValueLiteral.php → src/model/ConceptPropertyValueLiteral.php b/model/ConceptPropertyValueLiteral.php → src/model/ConceptPropertyValueLiteral.php
diff --git a/model/ConceptSearchParameters.php → src/model/ConceptSearchParameters.php b/model/ConceptSearchParameters.php → src/model/ConceptSearchParameters.php
diff --git a/model/DataObject.php → src/model/DataObject.php b/model/DataObject.php → src/model/DataObject.php
diff --git a/model/GlobalConfig.php → src/model/GlobalConfig.php b/model/GlobalConfig.php → src/model/GlobalConfig.php
@@ -30,11 +30,11 @@ class GlobalConfig extends BaseConfig {
      */
     private $configModifiedTime = null;
 
-    public function __construct($config_name='/../config.ttl')
+    public function __construct($config_name='../../config.ttl')
     {
         $this->cache = new Cache();
         try {
-            $this->filePath = realpath( dirname(__FILE__) . $config_name );
+            $this->filePath = realpath( dirname(__FILE__) . "/" . $config_name );
             if (!file_exists($this->filePath)) {
                 throw new Exception('config.ttl file is missing, please provide one.');
             }

diff --git a/model/LabelSkosXL.php → src/model/LabelSkosXL.php b/model/LabelSkosXL.php → src/model/LabelSkosXL.php
diff --git a/model/Model.php → src/model/Model.php b/model/Model.php → src/model/Model.php
diff --git a/model/Modifiable.php → src/model/Modifiable.php b/model/Modifiable.php → src/model/Modifiable.php
diff --git a/model/PluginRegister.php → src/model/PluginRegister.php b/model/PluginRegister.php → src/model/PluginRegister.php
diff --git a/model/Request.php → src/model/Request.php b/model/Request.php → src/model/Request.php
diff --git a/model/SkosmosTurtleParser.php → src/model/SkosmosTurtleParser.php b/model/SkosmosTurtleParser.php → src/model/SkosmosTurtleParser.php
diff --git a/model/Vocabulary.php → src/model/Vocabulary.php b/model/Vocabulary.php → src/model/Vocabulary.php
diff --git a/model/VocabularyCategory.php → src/model/VocabularyCategory.php b/model/VocabularyCategory.php → src/model/VocabularyCategory.php
diff --git a/model/VocabularyConfig.php → src/model/VocabularyConfig.php b/model/VocabularyConfig.php → src/model/VocabularyConfig.php
diff --git a/model/VocabularyDataObject.php → src/model/VocabularyDataObject.php b/model/VocabularyDataObject.php → src/model/VocabularyDataObject.php
diff --git a/model/resolver/LOCResource.php → src/model/resolver/LOCResource.php b/model/resolver/LOCResource.php → src/model/resolver/LOCResource.php
diff --git a/model/resolver/LinkedDataResource.php → src/model/resolver/LinkedDataResource.php b/model/resolver/LinkedDataResource.php → src/model/resolver/LinkedDataResource.php
diff --git a/model/resolver/RemoteResource.php → src/model/resolver/RemoteResource.php b/model/resolver/RemoteResource.php → src/model/resolver/RemoteResource.php
diff --git a/model/resolver/Resolver.php → src/model/resolver/Resolver.php b/model/resolver/Resolver.php → src/model/resolver/Resolver.php
diff --git a/model/resolver/WDQSResource.php → src/model/resolver/WDQSResource.php b/model/resolver/WDQSResource.php → src/model/resolver/WDQSResource.php
diff --git a/model/sparql/GenericSparql.php → src/model/sparql/GenericSparql.php b/model/sparql/GenericSparql.php → src/model/sparql/GenericSparql.php
diff --git a/model/sparql/JenaTextSparql.php → src/model/sparql/JenaTextSparql.php b/model/sparql/JenaTextSparql.php → src/model/sparql/JenaTextSparql.php
diff --git a/rest.php → src/rest.php b/rest.php → src/rest.php
@@ -3,7 +3,7 @@
 /**
  * Includes the side wide settings.
  */
-require_once 'vendor/autoload.php';
+require_once '../vendor/autoload.php';
 
 header("Access-Control-Allow-Origin: *"); // enable CORS for the whole REST API
 

diff --git a/view/about.twig → src/view/about.twig b/view/about.twig → src/view/about.twig
diff --git a/view/base-template.twig → src/view/base-template.twig b/view/base-template.twig → src/view/base-template.twig
diff --git a/view/concept-card.inc → src/view/concept-card.inc b/view/concept-card.inc → src/view/concept-card.inc
diff --git a/view/concept.twig → src/view/concept.twig b/view/concept.twig → src/view/concept.twig
diff --git a/view/error.twig → src/view/error.twig b/view/error.twig → src/view/error.twig
diff --git a/view/feedback.twig → src/view/feedback.twig b/view/feedback.twig → src/view/feedback.twig
diff --git a/view/footer.inc → src/view/footer.inc b/view/footer.inc → src/view/footer.inc
diff --git a/view/global-search.twig → src/view/global-search.twig b/view/global-search.twig → src/view/global-search.twig
diff --git a/view/header.inc → src/view/header.inc b/view/header.inc → src/view/header.inc
diff --git a/view/landing.twig → src/view/landing.twig b/view/landing.twig → src/view/landing.twig
diff --git a/view/search-results.inc → src/view/search-results.inc b/view/search-results.inc → src/view/search-results.inc
diff --git a/view/sidebar.inc → src/view/sidebar.inc b/view/sidebar.inc → src/view/sidebar.inc
diff --git a/view/vocab-home.twig → src/view/vocab-home.twig b/view/vocab-home.twig → src/view/vocab-home.twig
diff --git a/view/vocab-info.inc → src/view/vocab-info.inc b/view/vocab-info.inc → src/view/vocab-info.inc
diff --git a/view/vocab-search.twig → src/view/vocab-search.twig b/view/vocab-search.twig → src/view/vocab-search.twig
diff --git a/tests/ConceptMappingPropertyValueTest.php b/tests/ConceptMappingPropertyValueTest.php
@@ -16,7 +16,7 @@ protected function setUp() : void
     bind_textdomain_codeset('skosmos', 'UTF-8');
     textdomain('skosmos');
 
-    $this->model = new Model(new GlobalConfig('/../tests/testconfig.ttl'));
+    $this->model = new Model(new GlobalConfig('/../../tests/testconfig.ttl'));
     $this->vocab = $this->model->getVocabulary('mapping');
     $concepts = $this->vocab->getConceptInfo('http://www.skosmos.skos/mapping/m1', 'en');
     $this->concept = $concepts[0];

diff --git a/tests/ConceptPropertyTest.php b/tests/ConceptPropertyTest.php
@@ -13,7 +13,7 @@ protected function setUp() : void
     bind_textdomain_codeset('skosmos', 'UTF-8');
     textdomain('skosmos');
 
-    $this->model = new Model(new GlobalConfig('/../tests/testconfig.ttl'));
+    $this->model = new Model(new GlobalConfig('/../../tests/testconfig.ttl'));
   }
 
   /**

diff --git a/tests/ConceptPropertyValueLiteralTest.php b/tests/ConceptPropertyValueLiteralTest.php
@@ -15,7 +15,7 @@ protected function setUp() : void
     bind_textdomain_codeset('skosmos', 'UTF-8');
     textdomain('skosmos');
 
-    $this->model = new Model(new GlobalConfig('/../tests/testconfig.ttl'));
+    $this->model = new Model(new GlobalConfig('/../../tests/testconfig.ttl'));
     $this->vocab = $this->model->getVocabulary('test');
     $results = $this->vocab->getConceptInfo('http://www.skosmos.skos/test/ta112', 'en');
     $this->concept = reset($results);

diff --git a/tests/ConceptPropertyValueTest.php b/tests/ConceptPropertyValueTest.php
@@ -15,7 +15,7 @@ protected function setUp() : void
     bind_textdomain_codeset('skosmos', 'UTF-8');
     textdomain('skosmos');
 
-    $this->model = new Model(new GlobalConfig('/../tests/testconfig.ttl'));
+    $this->model = new Model(new GlobalConfig('/../../tests/testconfig.ttl'));
     $this->vocab = $this->model->getVocabulary('test');
     $results = $this->vocab->getConceptInfo('http://www.skosmos.skos/test/ta112', 'en');
     $this->concept = reset($results);