Merge pull request #26 from guiwoda/remove-illuminate-dependency

Removed illuminate/support in favor of doctrine/inflector

Author: patrickbrouwers

composer.json

@@ -25,7 +25,7 @@
   "require": {
     "php": ">=5.5.0",
     "doctrine/orm": "2.5.*",
-    "illuminate/support": "~5.1"
+    "doctrine/inflector": "^1.1"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",

src/Builders/Traits/Relations.php

@@ -2,7 +2,7 @@
 
 namespace LaravelDoctrine\Fluent\Builders\Traits;
 
-use Illuminate\Support\Str;
+use Doctrine\Common\Inflector\Inflector;
 use LaravelDoctrine\Fluent\Buildable;
 use LaravelDoctrine\Fluent\Relations\ManyToMany;
 use LaravelDoctrine\Fluent\Relations\ManyToOne;
@@ -165,7 +165,9 @@ public function addRelation(Relation $relation, callable $callback = null)
      */
     protected function guessSingularField($entity, $field = null)
     {
-        return $field ?: Str::camel(class_basename($entity));
+        return $field ?: Inflector::singularize(
+            lcfirst(basename(str_replace('\\', '/', $entity)))
+        );
     }
 
     /**
@@ -176,7 +178,7 @@ protected function guessSingularField($entity, $field = null)
      */
     protected function guessPluralField($entity, $field = null)
     {
-        return $field ?: Str::plural($this->guessSingularField($entity));
+        return $field ?: Inflector::pluralize($this->guessSingularField($entity));
     }
 
     /**

src/Relations/AbstractRelation.php

@@ -3,6 +3,7 @@
 namespace LaravelDoctrine\Fluent\Relations;
 
 use BadMethodCallException;
+use Doctrine\Common\Inflector\Inflector;
 use Doctrine\ORM\Mapping\Builder\AssociationBuilder;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
 use Doctrine\ORM\Mapping\NamingStrategy;
@@ -84,7 +85,7 @@ abstract protected function createAssociation(ClassMetadataBuilder $builder, $re
     public function cascade(array $cascade)
     {
         foreach ($cascade as $name) {
-            $method = 'cascade' . studly_case(strtolower($name));
+            $method = 'cascade' . Inflector::classify(strtolower($name));
 
             if (!method_exists($this->association, $method)) {
                 throw new InvalidArgumentException('Cascade [' . $name . '] does not exist');
@@ -103,7 +104,7 @@ public function cascade(array $cascade)
      */
     public function fetch($strategy)
     {
-        $method = 'fetch' . studly_case(strtolower($strategy));
+        $method = 'fetch' . Inflector::classify(strtolower($strategy));
 
         if (!method_exists($this->association, $method)) {
             throw new InvalidArgumentException('Fetch [' . $strategy . '] does not exist');