#395, refine the code according to latest pull review comments, change the language, version mapping

Author: Li

src/packagedcode/phpcomposer.py

@@ -55,13 +55,13 @@
 
 
 class PHPComposerPackage(models.Package):
-    metafiles = ('package.json')
+    metafiles = ('composer.json')
     filetypes = ('.json',)
-    mimetypes = ('application/x-tar',)
+    mimetypes = ('text/xml',)
     repo_types = (models.repo_phpcomposer,)
 
     type = models.StringType(default='phpcomposer')
-    primary_language = models.StringType(default='JavaScript')
+    primary_language = models.StringType(default='PHP')
 
     @classmethod
     def recognize(cls, location):
@@ -84,6 +84,7 @@ def parse(location):
         ('name', 'name'),
         ('description', 'summary'),
         ('keywords', 'keywords'),
+        ('version', 'version'),
         ('homepage', 'homepage_url'),
     ])
 
@@ -109,7 +110,6 @@ def parse(location):
     # a composer.json is at the root of a PHP composer package
     base_dir = fileutils.parent_directory(location)
     package.location = base_dir
-    # for now we only recognize a package.json, not a node_modules directory yet
     package.metafile_locations = [location]
     package.version = data.get('version')
     for source, target in plain_fields.items():
@@ -359,15 +359,6 @@ def deps_mapper(deps, package, field_name):
 dev_dependencies_mapper = partial(deps_mapper, field_name='devDependencies')
 
 
-person_parser = re.compile(
-    r'^(?P<name>[^\(<]+)'
-    r'\s?'
-    r'(?P<email><([^>]+)>)?'
-    r'\s?'
-    r'(?P<url>\([^\)]+\))?$'
-).match
-
-
 def parse_person(persons):
     """
     https://getcomposer.org/doc/04-schema.md#authors

tests/packagedcode/data/phpcomposer/a-timer/composer.json.expected

@@ -2,7 +2,7 @@
   "type": "phpcomposer", 
   "name": "jandreasn/a-timer", 
   "version": null, 
-  "primary_language": "JavaScript", 
+  "primary_language": "PHP", 
   "packaging": null, 
   "summary": "A simple timer.", 
   "description": null, 

tests/packagedcode/data/phpcomposer/framework/composer.json.expected

@@ -2,7 +2,7 @@
   "type": "phpcomposer", 
   "name": "narrowspark/framework", 
   "version": null, 
-  "primary_language": "JavaScript", 
+  "primary_language": "PHP", 
   "packaging": null, 
   "summary": "Narrowspark Framework for Creative People.", 
   "description": null, 

tests/packagedcode/data/phpcomposer/slim/composer.json.expected

@@ -2,7 +2,7 @@
   "type": "phpcomposer", 
   "name": "slim/slim", 
   "version": null, 
-  "primary_language": "JavaScript", 
+  "primary_language": "PHP", 
   "packaging": null, 
   "summary": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", 
   "description": null,