Sfoglia il codice sorgente

Updates requested by @stof.

Beau Simensen 13 anni fa
parent
commit
c267224ce6

+ 9 - 9
app/Resources/FOSUserBundle/views/Profile/show.html.twig

@@ -10,15 +10,15 @@
         <p><a href="{{ path('user_profile', {'name':app.user.username}) }}">View your public profile</a></p>
 
         {% if app.user.apiToken %}
-        <h1>Your API Token</h1>
-        <p><pre><code>{{ app.user.apiToken }}</code></pre></p>
-        <p>
-        You can use your API token to interact with the Packagist API.
-        </p>
-        <p>Your <a href="http://help.github.com/post-receive-hooks/">GitHub Post-Receive URL</a> is:</p>
-        <p>
-        <pre><code>{{ url('github_postreceive', { 'username': app.user.username, 'apiToken': app.user.apiToken }) }}</code></pre>
-        </p>
+            <h1>Your API Token</h1>
+            <p><pre><code>{{ app.user.apiToken }}</code></pre></p>
+            <p>
+            You can use your API token to interact with the Packagist API.
+            </p>
+            <p>Your <a href="http://help.github.com/post-receive-hooks/">GitHub Post-Receive URL</a> is:</p>
+            <p>
+            <pre><code>{{ url('github_postreceive', { 'username': app.user.username, 'apiToken': app.user.apiToken }) }}</code></pre>
+            </p>
         {% endif %}
 
         <h1>Your packages</h1>

+ 0 - 1
src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -18,7 +18,6 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 use Packagist\WebBundle\Package\Updater;
-use Composer\Repository\VcsRepository;
 
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>

+ 1 - 1
src/Packagist/WebBundle/Controller/ApiController.php

@@ -52,7 +52,7 @@ class ApiController extends Controller
     public function githubPostReceive(Request $request)
     {
         $payload = json_decode($request->request->get('payload'), true);
-        if (!$payload or !isset($payload['repository']['url'])) {
+        if (!$payload || !isset($payload['repository']['url'])) {
             return new Response(json_encode(array('status' => 'error', 'message' => 'Missing or invalid payload',)), 406);
         }
 

+ 2 - 5
src/Packagist/WebBundle/Entity/UserRepository.php

@@ -21,11 +21,8 @@ class UserRepository extends EntityRepository
 {
     public function findUsersMissingApiToken()
     {
-        $qb = $this->getEntityManager()->createQueryBuilder();
-        $qb->select('u')
-            ->from('Packagist\WebBundle\Entity\User', 'u')
-            ->where('u.apiToken IS NULL or u.apiToken = ?0')
-            ->setParameters(array(''));
+        $qb = $this->createQueryBuilder('u')
+            ->where('u.apiToken IS NULL');
         return $qb->getQuery()->getResult();
     }
 }