Merge branch 'drupal' of github.com:winmillwill/packagist into drupal

Conflicts:
	composer.lock
	src/Packagist/WebBundle/Package/BackgroundUpserter.php

Author: winmillwill

app/AppKernel.php

@@ -23,7 +23,8 @@ public function registerBundles()
             new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
             new Nelmio\SolariumBundle\NelmioSolariumBundle(),
             new Nelmio\SecurityBundle\NelmioSecurityBundle(),
-            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle()
+            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle()
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/Resources/FOSUserBundle/views/Profile/show.html.twig

@@ -18,7 +18,7 @@
             <p><a href="#" onclick="this.parentNode.innerHTML = '<pre><code>{{ app.user.apiToken }}</code></pre>'; return false;">Show API Token</a></p>
             <p>You can use your API token to interact with the Packagist API.</p>
             <h1>GitHub Service Hook</h1>
-            <p>Enabling the Packagist service hook ensures that your package will always be updated instantly when you push to GitHub. To do so you can go to your GitHub repository, click the "Settings" button, then "Service Hooks". Pick "Packagist" in the list, and add your API token (see above), plus your Packagist username if it is not the same as on GitHub. Check the "Active" box and submit the form.</p>
+            <p>Enabling the Packagist service hook ensures that your package will always be updated instantly when you push to GitHub. To do so you can go to your GitHub repository, click the "Settings" button, then "Webhooks &amp; Services". Add a "Packagist" service, and configure it with your API token (see above), plus your Packagist username. Check the "Active" box and submit the form. You can then hit the "Test Service" button to trigger it and check if Packagist removes the warning about the package not being auto-updated.</p>
             <h1>Bitbucket POST Service</h1>
             <p>To enable the Bitbucket service hook, go to your BitBucket repository, open the "Admin" tab and select "Services" in the menu. Pick "POST" in the list and add it to your repository. Afterwards, you have to enter the Packagist endpoint, containing both your username and API token (see above). Enter <code>https://packagist.org/api/bitbucket?username={{ app.user.username }}&amp;apiToken=&hellip;</code> for the service's URL. Save your changes and you're done.</p>
         {% endif %}

app/Resources/HWIOAuthBundle/views/Connect/login.html.twig

@@ -20,11 +20,6 @@
                     <input type="password" id="password" name="_password" />
                 </div>
 
-                <div>
-                    <input type="checkbox" id="remember_me" name="_remember_me" value="on" checked="checked" />
-                    <label for="remember_me">{{ 'security.login.remember_me'|trans({}, 'FOSUserBundle') }}</label>
-                </div>
-
                 {% if packagist_host and packagist_host in app.request.headers.get('Referer') %}
                     <input type="hidden" name="_target_path" value="{{ app.request.headers.get('Referer') }}" />
                 {% endif %}

app/config/config.yml

@@ -1,4 +1,5 @@
 imports:
+    - { resource: defaults.yml }
     - { resource: parameters.yml }
     - { resource: security.yml }
 
@@ -16,6 +17,8 @@ framework:
     session:
         name: packagist
         cookie_lifetime: 3600
+        cookie_httponly: true
+        save_path: %session_save_path%
     trusted_proxies: %trusted_proxies%
     trusted_hosts: %trusted_hosts%
     http_method_override: true

app/config/config_dev.yml

@@ -1,6 +1,5 @@
 imports:
     - { resource: config.yml }
-    - { resource: twig_dev.yml }
 
 framework:
     router:   { resource: "%kernel.root_dir%/config/routing_dev.yml" }
@@ -20,5 +19,9 @@ monolog:
             type:  firephp
             level: info
 
+hwi_oauth:
+    http_client:
+        verify_peer: false
+
 #assetic:
 #    use_controller: true

app/config/defaults.yml

@@ -0,0 +1,4 @@
+parameters:
+    packagist_host: ~
+    packagist_metadata_dir: "%kernel.cache_dir%/composer-packages-build"
+    session_save_path: %kernel.cache_dir%/sessions

app/config/parameters.yml.dist

@@ -23,8 +23,9 @@ parameters:
     google_analytics:
         ga_key:
 
-    github.client_id: foo
-    github.client_secret: bar
+    # set those to values obtained by creating an application at https://github.com/settings/applications
+    github.client_id:
+    github.client_secret:
 
         # -- performance features --
         # set both to apc to optimize things if it is available

app/config/security.yml

@@ -22,7 +22,7 @@ security:
                 key: %remember_me.secret%
                 user_providers: packagist
                 name: pauth
-                remember_me_parameter: _remember_me
+                always_remember_me: true
                 lifetime: 31104000 # 1y
             logout:       true
             anonymous:    true

app/config/twig_dev.yml

@@ -27,6 +27,8 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/symfony": "2.3.*",
+        "doctrine/migrations": "~1.0.0@dev",
+        "doctrine/doctrine-migrations-bundle": "~2.1.0@dev",
         "doctrine/orm": "~2.3",
         "doctrine/doctrine-bundle": "1.2.*",
         "twig/extensions": "~1.0",
@@ -41,22 +43,21 @@
 
         "composer/composer": "1.0.x-dev",
         "friendsofsymfony/user-bundle": "1.*",
-        "hwi/oauth-bundle": "dev-master",
-        "nelmio/solarium-bundle": "1.*",
-        "nelmio/security-bundle": "1.*",
+        "hwi/oauth-bundle": "~0.4@dev",
+        "nelmio/solarium-bundle": "~1.0",
+        "nelmio/security-bundle": "~1.0",
         "predis/predis": "0.8.*",
-        "snc/redis-bundle": "dev-master",
-        "white-october/pagerfanta-bundle": "1.0.*@dev",
+        "snc/redis-bundle": "~1.1@dev",
+        "white-october/pagerfanta-bundle": "~1.0",
         "zendframework/zend-feed": "2.0.*",
         "zendframework/zend-servicemanager": "2.0.*",
         "zendframework/zend-uri": "2.0.*",
         "zendframework/zend-version": "2.0.*",
-
-        "kriswallsmith/assetic": "@dev",
-        "pagerfanta/pagerfanta": "@dev",
-        "guzzle/http": "*",
+        "guzzle/guzzle": "~3.7",
         "drupal/parse-composer": "dev-master@dev",
-        "oldsound/rabbitmq-bundle": "1.4.*"
+        "oldsound/rabbitmq-bundle": "1.4.*",
+        "kriswallsmith/assetic": "~1.2@alpha",
+        "pagerfanta/pagerfanta": "~1.0"
     },
     "scripts": {
         "post-install-cmd": [