From c5273263eaf70baa36cbc964ccb60364a3af2238 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Fri, 6 Jul 2012 12:43:47 -0300 Subject: [PATCH 1/3] composer support --- composer.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 composer.json diff --git a/composer.json b/composer.json new file mode 100644 index 0000000..d4fc411 --- /dev/null +++ b/composer.json @@ -0,0 +1,21 @@ +{ + "name": "united-prototype/php-ga", + "description": "\"ga.js in PHP\" - Implementation of a generic server-side Google Analytics client in PHP that implements nearly every parameter and tracking feature of the original GA Javascript client.", + "license": "LGPL-3.0", + "keywords": ["google", "analytics", "server"], + "homepage": "https://github.com/thomasbachem/php-ga", + "authors": [ + { + "name": "Thomas Bachem", + "email": "mail@thomasbachem.com" + } + ], + "require": { + "php": ">=5.3.0" + }, + "autoload": { + "psr-0": { + "UnitedPrototype\\GoogleAnalytics": "src/" + } + } +} From b74ae13e99401a980be2cf9f32fdca885f70cda7 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 10 Jul 2012 11:32:20 -0300 Subject: [PATCH 2/3] PSR-0 autoloading --- src/{ => UnitedPrototype}/GoogleAnalytics/Campaign.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Config.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/CustomVariable.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Event.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Exception.php | 0 .../GoogleAnalytics/Internals/ParameterHolder.php | 0 .../GoogleAnalytics/Internals/Request/EventRequest.php | 0 .../GoogleAnalytics/Internals/Request/HttpRequest.php | 0 .../GoogleAnalytics/Internals/Request/ItemRequest.php | 0 .../GoogleAnalytics/Internals/Request/PageviewRequest.php | 0 .../GoogleAnalytics/Internals/Request/Request.php | 0 .../Internals/Request/SocialInteractionRequest.php | 0 .../GoogleAnalytics/Internals/Request/TransactionRequest.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Util.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Internals/X10.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Item.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Page.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Session.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/SocialInteraction.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Tracker.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Transaction.php | 0 src/{ => UnitedPrototype}/GoogleAnalytics/Visitor.php | 0 src/autoload.php | 2 +- 23 files changed, 1 insertion(+), 1 deletion(-) rename src/{ => UnitedPrototype}/GoogleAnalytics/Campaign.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Config.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/CustomVariable.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Event.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Exception.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/ParameterHolder.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/EventRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/HttpRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/ItemRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/PageviewRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/Request.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/SocialInteractionRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Request/TransactionRequest.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/Util.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Internals/X10.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Item.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Page.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Session.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/SocialInteraction.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Tracker.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Transaction.php (100%) rename src/{ => UnitedPrototype}/GoogleAnalytics/Visitor.php (100%) diff --git a/src/GoogleAnalytics/Campaign.php b/src/UnitedPrototype/GoogleAnalytics/Campaign.php similarity index 100% rename from src/GoogleAnalytics/Campaign.php rename to src/UnitedPrototype/GoogleAnalytics/Campaign.php diff --git a/src/GoogleAnalytics/Config.php b/src/UnitedPrototype/GoogleAnalytics/Config.php similarity index 100% rename from src/GoogleAnalytics/Config.php rename to src/UnitedPrototype/GoogleAnalytics/Config.php diff --git a/src/GoogleAnalytics/CustomVariable.php b/src/UnitedPrototype/GoogleAnalytics/CustomVariable.php similarity index 100% rename from src/GoogleAnalytics/CustomVariable.php rename to src/UnitedPrototype/GoogleAnalytics/CustomVariable.php diff --git a/src/GoogleAnalytics/Event.php b/src/UnitedPrototype/GoogleAnalytics/Event.php similarity index 100% rename from src/GoogleAnalytics/Event.php rename to src/UnitedPrototype/GoogleAnalytics/Event.php diff --git a/src/GoogleAnalytics/Exception.php b/src/UnitedPrototype/GoogleAnalytics/Exception.php similarity index 100% rename from src/GoogleAnalytics/Exception.php rename to src/UnitedPrototype/GoogleAnalytics/Exception.php diff --git a/src/GoogleAnalytics/Internals/ParameterHolder.php b/src/UnitedPrototype/GoogleAnalytics/Internals/ParameterHolder.php similarity index 100% rename from src/GoogleAnalytics/Internals/ParameterHolder.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/ParameterHolder.php diff --git a/src/GoogleAnalytics/Internals/Request/EventRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/EventRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/EventRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/EventRequest.php diff --git a/src/GoogleAnalytics/Internals/Request/HttpRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/HttpRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/HttpRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/HttpRequest.php diff --git a/src/GoogleAnalytics/Internals/Request/ItemRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/ItemRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/ItemRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/ItemRequest.php diff --git a/src/GoogleAnalytics/Internals/Request/PageviewRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/PageviewRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/PageviewRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/PageviewRequest.php diff --git a/src/GoogleAnalytics/Internals/Request/Request.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/Request.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/Request.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/Request.php diff --git a/src/GoogleAnalytics/Internals/Request/SocialInteractionRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/SocialInteractionRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/SocialInteractionRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/SocialInteractionRequest.php diff --git a/src/GoogleAnalytics/Internals/Request/TransactionRequest.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Request/TransactionRequest.php similarity index 100% rename from src/GoogleAnalytics/Internals/Request/TransactionRequest.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Request/TransactionRequest.php diff --git a/src/GoogleAnalytics/Internals/Util.php b/src/UnitedPrototype/GoogleAnalytics/Internals/Util.php similarity index 100% rename from src/GoogleAnalytics/Internals/Util.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/Util.php diff --git a/src/GoogleAnalytics/Internals/X10.php b/src/UnitedPrototype/GoogleAnalytics/Internals/X10.php similarity index 100% rename from src/GoogleAnalytics/Internals/X10.php rename to src/UnitedPrototype/GoogleAnalytics/Internals/X10.php diff --git a/src/GoogleAnalytics/Item.php b/src/UnitedPrototype/GoogleAnalytics/Item.php similarity index 100% rename from src/GoogleAnalytics/Item.php rename to src/UnitedPrototype/GoogleAnalytics/Item.php diff --git a/src/GoogleAnalytics/Page.php b/src/UnitedPrototype/GoogleAnalytics/Page.php similarity index 100% rename from src/GoogleAnalytics/Page.php rename to src/UnitedPrototype/GoogleAnalytics/Page.php diff --git a/src/GoogleAnalytics/Session.php b/src/UnitedPrototype/GoogleAnalytics/Session.php similarity index 100% rename from src/GoogleAnalytics/Session.php rename to src/UnitedPrototype/GoogleAnalytics/Session.php diff --git a/src/GoogleAnalytics/SocialInteraction.php b/src/UnitedPrototype/GoogleAnalytics/SocialInteraction.php similarity index 100% rename from src/GoogleAnalytics/SocialInteraction.php rename to src/UnitedPrototype/GoogleAnalytics/SocialInteraction.php diff --git a/src/GoogleAnalytics/Tracker.php b/src/UnitedPrototype/GoogleAnalytics/Tracker.php similarity index 100% rename from src/GoogleAnalytics/Tracker.php rename to src/UnitedPrototype/GoogleAnalytics/Tracker.php diff --git a/src/GoogleAnalytics/Transaction.php b/src/UnitedPrototype/GoogleAnalytics/Transaction.php similarity index 100% rename from src/GoogleAnalytics/Transaction.php rename to src/UnitedPrototype/GoogleAnalytics/Transaction.php diff --git a/src/GoogleAnalytics/Visitor.php b/src/UnitedPrototype/GoogleAnalytics/Visitor.php similarity index 100% rename from src/GoogleAnalytics/Visitor.php rename to src/UnitedPrototype/GoogleAnalytics/Visitor.php diff --git a/src/autoload.php b/src/autoload.php index 3c57790..0dd0ebf 100644 --- a/src/autoload.php +++ b/src/autoload.php @@ -8,7 +8,7 @@ // Leave if class should not be handled by this autoloader if(strpos($className, 'UnitedPrototype\\GoogleAnalytics') !== 0) return; - $classPath = strtr(substr($className, strlen('UnitedPrototype')), '\\', '/') . '.php'; + $classPath = strtr($className, '\\', '/') . '.php'; if(file_exists(__DIR__ . $classPath)) { require(__DIR__ . $classPath); From 8ef68c423d53e90837143e35d88ba4b4eb3f5562 Mon Sep 17 00:00:00 2001 From: imilyukov Date: Wed, 31 Jul 2013 14:14:46 +0300 Subject: [PATCH 3/3] Invalide path concatenation Example: .../srcUnitedPrototype/GoogleAnalytics/... --- src/autoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/autoload.php b/src/autoload.php index 0dd0ebf..939e189 100644 --- a/src/autoload.php +++ b/src/autoload.php @@ -11,7 +11,7 @@ $classPath = strtr($className, '\\', '/') . '.php'; if(file_exists(__DIR__ . $classPath)) { - require(__DIR__ . $classPath); + require(__DIR__ . '/' . $classPath); } });