Merge pull request #16 from texdc/simplify_as_version

Simplify asVersion()

Author: bscSCORM

.gitignore

@@ -18,3 +18,8 @@ tmp/
 
 # wild
 todo.md
+
+# eclipse project files
+.buildpath
+.project
+.settings

.travis.yml

@@ -3,4 +3,6 @@ php:
   - 5.5
   - 5.4
   - hhvm
-before_script: cp tests/Config.php.travis-ci tests/Config.php
+before_script:
+  - cp tests/Config.php.travis-ci tests/Config.php
+  - composer install --dev

README.md

@@ -17,13 +17,13 @@ Requires PHP 5.4 or later. (If you must run something older you should look at t
 TinCanPHP is available via [Composer](http://getcomposer.org).
 
 ```
-php composer.phar require rusticisoftware/tincan:~0.0
+php composer.phar require rusticisoftware/tincan:@stable
 ```
 
-With the package installed require the Composer autoloader:
+When not using Composer, require the autoloader:
 
 ```php
-require 'vendor/autoload.php';
+require 'path/to/TinCan/autoload.php';
 ```
 
 ### Testing

autoload.php

@@ -0,0 +1,33 @@
+<?php
+/*
+    Copyright 2014 Rustici Software
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+if (file_exists('vendor/autoload.php')) {
+    // prefer the composer autoloader
+    return require_once('vendor/autoload.php');
+}
+
+spl_autoload_register(function($className) {
+    $namespace = 'TinCan\\';
+    if (stripos($className, $namespace) === false) {
+        return;
+    }
+    $sourceDir = __DIR__ . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR;
+    $fileName  = str_replace([$namespace, '\\'], [$sourceDir, DIRECTORY_SEPARATOR], $className) . '.php';
+    if (is_readable($fileName)) {
+        include $fileName;
+    }
+});

composer.json

@@ -24,10 +24,11 @@
         "issues": "https://github.com/RusticiSoftware/TinCanPHP/issues"
     },
     "require": {
-        "php": ">=5.4.0"
+        "php": "~5.4"
     },
     "require-dev": {
-        "phpdocumentor/phpdocumentor": "2.*"
+        "phpdocumentor/phpdocumentor": "2.*",
+        "phpunit/phpunit": "@stable"
     },
     "autoload": {
         "psr-4": {

phpunit.php

@@ -2,48 +2,10 @@
 
 date_default_timezone_set('UTC');
 
+require_once('autoload.php');
 require_once('tests/Config.php');
 require_once('tests/Constants.php');
 
-require_once('src/LRSInterface.php');
-require_once('src/StatementTargetInterface.php');
-require_once('src/VersionableInterface.php');
-
-require_once('src/ArraySetterTrait.php');
-require_once('src/FromJSONTrait.php');
-require_once('src/AsVersionTrait.php');
-
-require_once('src/Map.php');
-require_once('src/LRSResponse.php');
-
-require_once('src/Util.php');
-require_once('src/Version.php');
-require_once('src/LanguageMap.php');
-require_once('src/Extensions.php');
-require_once('src/ActivityDefinition.php');
-require_once('src/Activity.php');
-require_once('src/AgentAccount.php');
-require_once('src/Agent.php');
-require_once('src/Group.php');
-require_once('src/Verb.php');
-require_once('src/ContextActivities.php');
-require_once('src/Context.php');
-require_once('src/Score.php');
-require_once('src/Result.php');
-require_once('src/StatementRef.php');
-require_once('src/StatementBase.php');
-require_once('src/SubStatement.php');
-require_once('src/Statement.php');
-
-require_once('src/StatementsResult.php');
-require_once('src/About.php');
-require_once('src/Document.php');
-require_once('src/ActivityProfile.php');
-require_once('src/AgentProfile.php');
-require_once('src/State.php');
-
-require_once('src/RemoteLRS.php');
-
 register_shutdown_function(
     function () {
         if ($err = error_get_last()) {

src/About.php

@@ -24,13 +24,6 @@ class About implements VersionableInterface
     protected $version;
     protected $extensions;
 
-    private static $directProps = array(
-        'version',
-    );
-    private static $versionedProps = array(
-        'extensions',
-    );
-
     public function __construct() {
         if (func_num_args() == 1) {
             $arg = func_get_arg(0);

src/Activity.php

@@ -25,15 +25,6 @@ class Activity implements VersionableInterface, StatementTargetInterface
     protected $id;
     protected $definition;
 
-    private static $directProps = array(
-        'objectType',
-        'id',
-    );
-
-    private static $versionedProps = array(
-        'definition',
-    );
-
     public function __construct() {
         if (func_num_args() == 1) {
             $arg = func_get_arg(0);

src/ActivityDefinition.php

@@ -34,23 +34,6 @@ class ActivityDefinition implements VersionableInterface
     protected $target;
     protected $steps;
 
-    private static $directProps = array(
-        'type',
-        'moreInfo',
-        'interactionType',
-        'correctResponsesPattern',
-        'choices',
-        'scale',
-        'source',
-        'target',
-        'steps',
-    );
-    private static $versionedProps = array(
-        'name',
-        'description',
-        'extensions',
-    );
-
     public function __construct() {
         if (func_num_args() == 1) {
             $arg = func_get_arg(0);

src/AgentAccount.php

@@ -24,11 +24,6 @@ class AgentAccount implements VersionableInterface
     protected $name;
     protected $homePage;
 
-    private static $directProps = array(
-        'name',
-        'homePage',
-    );
-
     public function __construct() {
         if (func_num_args() == 1) {
             $arg = func_get_arg(0);