psr-4 compliance

epforgpl · Feb 21, 2015 · a00b01b · a00b01b
1 parent 074a0a8
commit a00b01b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -24,6 +24,11 @@
       "homepage": "http://epf.org.pl"
     }
   ],
+  "autoload": {
+    "psr-4": {
+      "epforgpl\\parsers\\": "src/"
+    }
+  },
   "require": {
     "gilbitron/php-simplecache": "~1.4"
   }

diff --git a/SenatParser.php → src/Senat.php b/SenatParser.php → src/Senat.php
@@ -4,12 +4,10 @@
  * @ver 1.2
  */
 
-namespace parldata\parsers;
+namespace epforgpl\parsers;
 
-define('__ROOT__', dirname(__FILE__));
-require_once(__ROOT__ . '/vendor/autoload.php');
-require_once(__ROOT__ . '/vendor/simple_html_dom.php');
-require_once(__ROOT__ . '/names.polish.php');
+require_once(dirname(dirname(__FILE__)) . '/vendor/simple_html_dom.php');
+require_once('names.polish.php');
 
 class ParserException extends \Exception {
 }
@@ -26,7 +24,7 @@ public function __construct() {
         if (defined('CACHE_ENABLED') ? CACHE_ENABLED : false) {
             $this->cache = new \Gilbitron\Util\SimpleCache();
 
-            $this->cache->cache_path = defined('CACHE_PATH') ? CACHE_PATH : __ROOT__ . '/.cache/';
+            $this->cache->cache_path = defined('CACHE_PATH') ? CACHE_PATH : '.cache/';
             $this->cache->cache_time = defined('CACHE_TTL') ? CACHE_TTL : 3600;
 
             if (!is_dir($this->cache->cache_path)) {

diff --git a/names.polish.php → src/names.polish.php b/names.polish.php → src/names.polish.php