Fix to take the return value into consideration (refs #3925) #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

isaosano wants to merge 743 commits into openpne:old-master from isaosano:t-3925

The diff you're trying to view is too large. We only load the first 3000 changed files.

.gitignore

-Original file line number
+Diff line change
@@ -1,9 +1,8 @@
     lib/form/doctrine/op*Plugin
-    web/cache/*
     log/*
     plugins/op*
+    !plugins/opAuthMailAddressPlugin
     !plugins/opSkinBasicPlugin
-    !plugins/opSkinClassicPlugin
     plugins/.*
     lib/filter/doctrine/*
     cache/*
@@ Expand Down @@

NOTICE

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,18 +20,26 @@ This product includes also softwares developed by :
  
        - Apache License 2.0

      - Andy Smith (http://term.ie/)

        - MIT License

      - Ryan Parman, Geoffrey Sneddon

        - BSD 3-clause License (SimplePie)

      - Fabien Potencier (http://fabien.potencier.org/)

        - MIT License

      - Kousuke Ebihara (http://co3k.org/)

        - Apache License 2.0

      - Stig Bakken, Gregory Beaver, Helgi Þormar Þorbjörnsson, Tomas V.V.Cox, Martin Jansen

        - BSD 2-clause License (PEAR)

      - Greg Beaver

        - BSD 2-clause License (PEAR_PackageFileManager2)

      - Vincent Oostindie, Alan Knowles, Peter Bowyer, Philippe Jausions

        - PHP License 3.0 (PEAR::Image_Transform)

        - PHP License 3.0 (Image_Transform)

      - Harry Fuecks, Lorenzo Alberton

        - BSD 3-clause License (Calendar)

    This product needs the third-party softwares listed blow to run.

      - PHP: Hypertext Preprocessor (5.2.4 +)

    This product includes dependent libraries listed blow:

      - symfony 1.4.1

      - LExpress/symfony1 1.5.9 (fork of symfony 1.4)

      - Zend Framework 1.10.8 (partly)

        - Zend_Acl

        - Zend_Exception

    @@ -47,6 +55,10 @@ This product includes dependent libraries listed blow:
  
        - Zend_Version

      - Auth OpenID 2.1.2

      - PHP OAuth library

      - SimplePie 1.4.3

      - sfFormExtraPlugin 1.0.12

      - sfImageHandlerPlugin 1.0.0

      - PEAR::Image_Transform 0.9.3

      - PEAR 1.10.3

      - PEAR_PackageFileManager2 1.0.4

      - Image_Transform 0.9.5

      - Calendar 0.5.5

apps/api/config/factories.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -52,23 +52,10 @@ all: @@
     #all:
     #  controller:
     #    class: sfFrontWebController
-    #
-    #  request:
-    #    class: sfWebRequest
-    #    param:
-    #      logging:           %SF_LOGGING_ENABLED%
-    #      path_info_array:   SERVER
-    #      path_info_key:     PATH_INFO
-    #      relative_url_root: ~
-    #      formats:
-    #        txt:  text/plain
-    #        js:   [application/javascript, application/x-javascript, text/javascript]
-    #        css:  text/css
-    #        json: [application/json, application/x-json]
-    #        xml:  [text/xml, application/xml, application/x-xml]
-    #        rdf:  application/rdf+xml
-    #        atom: application/atom+xml
-    #
+      request:
+        class: opWebRequest
     #  response:
     #    class: sfWebResponse
     #    param:
@@ Expand All / @@ -83,12 +70,10 @@ all: @@
     #      logging:         %SF_LOGGING_ENABLED%
     #      use_flash:       true
     #      default_culture: %SF_DEFAULT_CULTURE%
-    #
-    #  storage:
-    #    class: sfSessionStorage
-    #    param:
-    #      session_name: symfony
-    #
+      storage:
+        class: sfNoStorage
     #  view_cache:
     #    class: sfFileCache
     #    param:
@@ Expand Down @@

apps/api/config/routing.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,3 +13,118 @@ no_default: @@
     default:
       url:   /:module/:action/*
+    activity_search:
+      url: /activity/search.json
+      param: { module: activity, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_list:
+      url: /activity/list.json
+      param: { module: activity, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_member:
+      url: /activity/member.json
+      param: { module: activity, action: member, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_friends:
+      url: /activity/friends.json
+      param: { module: activity, action: friends, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_community:
+      url: /activity/community.json
+      param: { module: activity, action: community, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_mentions:
+      url: /activity/mentions.json
+      param: { module: activity, action: mentions, sf_format: json }
+      requirements: { sf_method: [get] }
+    activity_post:
+      url: /activity/post.json
+      param: { module: activity, action: post, sf_format: json }
+      requirements: { sf_method: [post, get] }
+    activity_delete:
+      url: /activity/delete.json
+      param: { module: activity, action: delete, sf_format: json }
+      requirements: { sf_method: [get] }
+    member_search:
+      url: /member/search.json
+      param: { module: member, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    member_list:
+      url: /member/list.json
+      param: { module: member, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    member_community:
+      url: /member/community.json
+      param: { module: member, action: community, sf_format: json }
+      requirements: { sf_method: [get] }
+    member_friend_accept:
+      url: /member/friend_accept.json
+      param: { module: member, action: friendAccept, sf_format: json }
+      requirements: { sf_method: [get] }
+    member_friend_reject:
+      url: /member/friend_reject.json
+      param: { module: member, action: friendAccept, sf_format: json, reject: 1 }
+      requirements: { sf_method: [get] }
+    member_friend_request:
+      url: /member/friend_request.json
+      param: { module: member, action: friendRequest, sf_format: json, }
+      requirements: { sf_method: [get] }
+    member_friend_unlink:
+      url: /member/friend_unlink.json
+      param: { module: member, action: friendRequest, sf_format: json, unlink: 1 }
+      requirements: { sf_method: [get] }
+    community_search:
+      url: /community/search.json
+      param: { module: community, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    community_list:
+      url: /community/list.json
+      param: { module: community, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    community_member:
+      url: /community/member.json
+      param: { module: community, action: member, sf_format: json }
+      requirements: { sf_method: [get] }
+    community_join:
+      url: /community/join.json
+      param: { module: community, action: join, sf_format: json }
+      requirements: { sf_method: [get] }
+    push_search:
+      url: /push/search.json
+      param: { module: push, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    push_list:
+      url: /push/list.json
+      param: { module: push, action: search, sf_format: json }
+      requirements: { sf_method: [get] }
+    push_count:
+      url: /push/count.json
+      param: { module: push, action: count, sf_format: json }
+      requirements: { sf_method: [get] }
+    push_read:
+      url: /push/read.json
+      param: { module: push, action: read, sf_format: json }
+      requirements: { sf_method: [get] }

apps/api/config/settings.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -13,7 +13,7 @@ dev:
  
    test:

      .settings:

        error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>

        error_reporting:        <?php echo (E_ERROR | E_WARNING | E_PARSE)."\n" ?>

        cache:                  false

        web_debug:              false

        no_script_name:         false

    @@ -30,8 +30,17 @@ all:
  
    #all:

    #  .actions:

    #    error_404_module:       default   # To be called when a 404 error is raised

    #    error_404_action:       error404  # Or when the requested URL doesn't match any route

        error_404_module:       default   # To be called when a 404 error is raised

        error_404_action:       error404  # Or when the requested URL doesn't match any route

        error_400_module:       default

        error_400_action:       error400

        error_401_module:       default

        error_401_action:       error401

        error_403_module:       default

        error_403_action:       error403

    #

    #    login_module:           default   # To be called when a non-authenticated user

    #    login_action:           login     # Tries to access a secure page

    @@ -42,7 +51,7 @@ all:
  
    #    module_disabled_module: default   # To be called when a user requests 

    #    module_disabled_action: disabled  # A module disabled in the module.yml

    #

      .settings:

    #  .settings:

    #    # Optional features. Deactivating unused features boots performance a bit.

    #    use_database:           on        # Enable database manager. Set to off if you don't use a database.

        i18n:                   on       # Enable interface translation. Set to off if your application should not be translated.

    @@ -74,7 +83,7 @@ all:
  
    #    calendar_web_dir:       /sf/calendar

    #

    #    # Helpers included in all templates by default

    #    standard_helpers:       [Partial, Cache, Form]

        standard_helpers:       [Partial, Cache, sfImage, opUtil, opJsonApi]

    #

    #    # Activated modules from plugins or from the symfony core

    #    enabled_modules:        [default]

    @@ -90,4 +99,4 @@ all:
  
    #    logging_enabled:        true

    #

    #    # i18n

        default_culture:        ja        # Default user culture

        default_culture:        ja_JP        # Default user culture

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix to take the return value into consideration (refs #3925) #428

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Fix to take the return value into consideration (refs #3925) #428

Are you sure you want to change the base?

Uh oh!

Fix to take the return value into consideration (refs #3925) #428

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!