Better phpdoc and method naming

remotes/origin/fix-10825
Robin Appelman 12 years ago
parent 8605e2e6a5
commit fa3393674c
  1. 2
      apps/files/ajax/newfile.php
  2. 2
      apps/files/ajax/scan.php
  3. 2
      core/ajax/update.php
  4. 2
      lib/private/appframework/core/api.php
  5. 4
      lib/private/server.php
  6. 2
      lib/public/ieventsource.php
  7. 4
      lib/public/iservercontainer.php

@ -16,7 +16,7 @@ $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
$source = isset( $_REQUEST['source'] ) ? trim($_REQUEST['source'], '/\\') : '';
if($source) {
$eventSource = \OC::$server->getEventSource();
$eventSource = \OC::$server->createEventSource();
} else {
OC_JSON::callCheck();
}

@ -15,7 +15,7 @@ if (isset($_GET['users'])) {
$users = array(OC_User::getUser());
}
$eventSource = \OC::$server->getEventSource();
$eventSource = \OC::$server->createEventSource();
$listener = new ScanListener($eventSource);
foreach ($users as $user) {

@ -4,7 +4,7 @@ require_once '../../lib/base.php';
if (OC::checkUpgrade(false)) {
$l = new \OC_L10N('core');
$eventSource = \OC::$server->getEventSource();
$eventSource = \OC::$server->createEventSource();
$updater = new \OC\Updater(\OC_Log::$object);
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Turned on maintenance mode'));

@ -114,7 +114,7 @@ class API implements IApi{
* @return \OCP\IEventSource a new open EventSource class
*/
public function openEventSource(){
return \OC::$server->getEventSource();
return \OC::$server->createEventSource();
}
/**

@ -494,11 +494,11 @@ class Server extends SimpleContainer implements IServerContainer {
}
/**
* Returns a search instance
* Create a new event source
*
* @return \OCP\IEventSource
*/
function getEventSource() {
function createEventSource() {
return new \OC_EventSource();
}
}

@ -13,6 +13,8 @@ namespace OCP;
* includes a fallback for older browsers and IE
*
* use server side events with caution, to many open requests can hang the server
*
* The event source will initialize the connection to the client when the first data is sent
*/
interface IEventSource {
/**

@ -237,9 +237,9 @@ interface IServerContainer {
function getCertificateManager($user = null);
/**
* Returns a search instance
* Create a new event source
*
* @return \OCP\IEventSource
*/
function getEventSource();
function createEventSource();
}

Loading…
Cancel
Save